With git 2.6 it’s now easier than ever to keep track of your work during an interactive rebase.

Previously, if you were rebasing interactively and had hit a conflict or stopped to reword a commit, git status would look like this:

$ git rebase -i HEAD~5 $ git status rebase in progress; onto 0927cd6 You are currently rebasing branch 't... Read More »