On 3/19/13, Ramkumar Ramachandra <artag...@gmail.com> wrote: > I know that this is expected behavior, but is there an easy way to get > rid of this inconsistency?
You can actually rely on "rebase" to run the appropriate command. In the first edit commit (the_ no conflict one), I usually run only "git add" to add my changes, then just run "git rebase --cont"._ And "rebase" will recognize that I'm doing an "edit" and run "git commit --amend" for me. For the "unmerged case", I'd do the same "add and continue", and "rebase" will run "git commit" for__ me. By doing that, the two scenarios feel a bit more consistent. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
