2 ms·

I don't like merge commits when you can avoid them.

• waffle_ss 14y ago
  Indeed... git pull --rebase is your friend (or better yet, set rebase as default strategy for pulls)