Sverre Rabbelier <srabbelier@xxxxxxxxx> writes: > On Wed, Feb 10, 2010 at 23:21, Junio C Hamano <gitster@xxxxxxxxx> wrote: >> Having said all I did in the previous message, I think "am --continue" >> would be a good addition. > > How about 'cherry-pick --resolved' though ;). 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. While I think "--resolved" makes sense, I do not see much benefit, and it largely depends on what you do. If you are suggesting to commit with what is kept in $GIT_DIR/MERGE_MSG, I would actually recommend against it. The message will have "Conflicts:" information but that is meaningless unless you are recording from what context the commit was cherry-picked from at the same time. -- 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