When an interactive rebase stops because of conflicts in a commit marked with pick, the user must edit the file to resolve them, run "git add", and run "git rebase --continue". It then opens vi and asks the user to edit the message. If I told the command to edit, I think it is OK to start vi, but when I am just picking the commit, I should be able to use the message from the original commit without having to view nor edit nor save it first. Is this a bug? To reproduce this, first prepare a file with five lines and create an initial commit: % git init % cat file 1 2 3 4 5 % git add file % git commit -m 'initial' % git tag initial Then edit the second line and replace "2" with "two", and commit. Then edit the third line and replace "3" with "three", and commit. Then say: % git rebase --interactive initial and reverse the first two lines. It stops at the first commit that changes "3" to "three". Resolve the conflicts by editing it so that it has "1 2 three 4 5", and say: % git add file % git rebase --continue At this point, git opens vi and asks me to edit the message. -- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/ ---------------------------------------------------------------------- Finally - A spam blocker that actually works. http://www.bluebottle.com/tag/4 -- 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
