Hi Junio, Please, do not apply my previous patch. I just realized that it will break the following sequence of commands when you are stopped on a conflicting commit during rebase: $ edit file $ git add file $ git commit $ git commit --amend I don't see a good solution right now. Perhaps, the better approach will be to remove the suggestion of using "git commit --amend" and instead to recommend to use "git add" to add your changes and then run "git rebase --continue". This works regardless whether you stop on the "edit" mark or conflict. The only problem with that is what if the user actually wanted to edit the commit message. Currently, saying just "git rebase --continue" without adding anything will not allow you to edit the commit message. After studying git-rebase script, I noticed that it always commit with the --no-verify option. It makes sense for those commits that were just "pick" but IMHO those commits that were edited by users probably should be commited in the normal way, so the pre-commit hook can ensure that your changes are okay. Dmitry -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
