Jay Soffian wrote: > CHERRY_PICK_HEAD is not written if you use --no-commit. I'm going to > punt here and say that's not my itch, thus... > > On Tue, Feb 15, 2011 at 6:47 PM, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: >> But that was a silly example --- -C takes care of authorship on its >> own. ÂA better example might be >> >> Â Â Â Âgit cherry-pick --no-commit F >> Â Â Â Âgit commit -F the-message >> >> or >> >> Â Â Â Âgit cherry-pick --no-commit F >> Â Â Â Âgit commit --amend -C F-prime > > Because CHERRY_PICK_HEAD wasn't written, commit in this case behaves > as it did before this series. I'll just wait for the reroll and try it. But surely it is clear what I am asking? git cherry-pick conflicting-thing ... fix conflict ... git commit -F message should either error out or respect the user's wish, and likewise git cherry-pick conflicting-thing ... fix conflict ... git commit --amend -C something-else should error out. -- 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