On Wed, Feb 10, 2010 at 02:34:21PM -0800, Junio C Hamano wrote: > Changing the insn to suggest using "-C topic" when the original command > line was "git cherry-pick topic" would be a good addition, too. Currently > we suggest "-c" and abbreviated object name, neither of which is sensible. I think using the actual name instead of the abbreviated sha1 is sensible. But I think "-c" makes sense, as it gives the user the chance to look over the commit message to see if they need to tweak it to match the conflict fixups. Savvy users who don't want to do that will know to use "-C". Series to follow: [1/4]: cherry-pick: rewrap advice message [2/4]: cherry-pick: refactor commit parsing code [3/4]: cherry-pick: format help message as strbuf [4/4]: cherry-pick: show commit name instead of sha1 -Peff -- 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