this is a great example of how using magit in emacs helps to really learn git.

entropicthoughts.com/rebasing-in-...