On Thu, Feb 11, 2010 at 06:05:18PM -0500, Jay Soffian wrote: > On Thu, Feb 11, 2010 at 4:19 PM, Jeff King <peff@xxxxxxxx> wrote: > > Automatic cherry-pick failed. After resolving the conflicts, > > mark the corrected paths with 'git add <paths>' or 'git rm <paths>' > > and commit the result with: > > > > git commit -c HEAD~23 > > > > Blech, how is this an improvement? Why can't I just say "git > cherry-pick --continue"? Because nobody has implemented it yet. ;P The two improvements here are: 1. We show what you typed as "git cherry-pick $X", so if you want to re-type it, you know it is just "git commit -c $X". This is not about speed, but about being more sensible for users to read. 2. The output is now cut-and-pasteable, so you don't have to type it if it is still available in your terminal. These were meant to make the situation better than it was; I agree that "git cherry-pick --continue" would be better still. -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