From: Sverre Rabbelier Date: Wed, 10 Feb 2010 22:38:28 GMT Subject: Re: git cherry-pick --continue? Message-ID: In-Reply-To: <7vpr4c200i.fsf@alter.siamese.dyndns.org> Heya, On Wed, Feb 10, 2010 at 23:34, 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 it's sensible to use '-c' instead of '-C', just like 'git rebase -i' lets you change the commit message after you resolve a conflict. > 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. I'm not sure how to implement it, but I was thinking to just automate the 'git commit -c ...' part. I don't like having to copy/paste some instruction, so maybe we can record the original commit somewhere and have 'git cherry-pick --resolve' be equivalent to 'git commit -c `cat .git/CHERRY_PICK_CMT`', or somesuch? -- Cheers, Sverre Rabbelier