mgrim: Everything Updated All The Time

My current favorite command line alias is mgrim, composed of four other aliases. Here’s what it is, and what it does.

a a a l l l i i i a a a s s s g g m m r g r i r = m i ' = m g ' = c g ' o i g t m m r a r s e & t b & e a r s g e r & i & - m i ' g p m r a s & t & e r g ' c o - & & g i t r e b a s e m a s t e r '

Starting from a feature branch:

  • gmr - checkout the master branch (gco is a Hashrocket alias for git checkout. Pull from origin/master and try to put my commits in the right place in history (gpr is a Hashrocket alias for git pull --rebase). Checkout my feature branch. Fast-forward my branch to the top of master (as though I had branched off master’s current HEAD.
  • grim - Open an interactive rebase to cleanup everything on my branch (see ‘Squash Your PR’)

I use feature branches for work, and use this command right before merging into master. The result? I’m always forced to look at my branch history and squash it down to the minimum, which is good for everyone (including future me). And, I never have a merge conflict with master.