On Wed, Feb 16, 2011 at 4:42 PM, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: > Nit: GIT_CHERRY_PICK_HELP is not just for rebase --interactive but > for arbitrary porcelain that wants to take care of the commit itself > (see v1.5.4-rc0~106^2~1, revert/cherry-pick: Allow overriding the > help text by the calling Porcelain, 2007-11-28). What is the arbitrary porcelain you have in mind? :-) > The conservative thing to do is indeed to remove CHERRY_PICK_HEAD in > this case, I suppose. ÂBut I'd like to have the CHERRY_PICK_HEAD to > get the --amend safety when rebasing. ÂI can send a separate patch > for it if you'd like. Please do, since I'm not really sure what you have in mind. If CHERRY_PICK_HEAD is left-behind, it interferes with the eventually commit done by rebase --continue. I suppose we could give commit.c some additional logic to detect when it's being called by rebase (setting whence = FROM_REBASE?). In the mean time, I'll re-roll with your additional tests and Junio's prior feedback. Thanks, j. -- 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