@b0rk A sort of work-around for the git commit --amend/git rebase --continue confusion is to always use git add followed by git rebase --continue. Those steps do the right thing whether you're resolving a conflict or editing a commit.