When in the middle of an interactive rebase, e.g. git rebase -i HEAD~12 and adding/editing some commits, I'm often confused as to which commit I'm editing, especially when there's a merge conflict:
> git status
rebase in progress; onto 55d9292
You are currently rebasing branch 'master' on '55d9292'.
(fix conflicts and then run "git rebase --continue")
(use "git rebase --skip" to skip this patch)
(use "git rebase --abort" to check out the original branch)
Unmerged paths:
(use "git reset HEAD <file>..." to unstage)
(use "git add <file>..." to mark resolution)
both modified: file
no changes added to commit (use "git add" and/or "git commit -a")
How can I get a clear idea of all the patches involved in the current state? For example, what is the base patch, what patch I'm "picking", which patch the merge conflicts are coming from?