On Mon, Feb 14, 2011 at 10:09 AM, Jay Soffian <jaysoffian@xxxxxxxxx> wrote: > I've had it on my TODO list for a while now to: > ... > 2. improve the cherry-pick conflict UX. I was thinking of out > CHERRY_HEAD on conflict and then adding a cherry-pick --continue > option which acts like rebase --continue. CHERRY_HEAD is what was > being picked at the time of conflict and can be used by the bash > completion script for proper prompting, as well as obviously the > --continue option. Yes, we have so far only "use commit -c $that_one", which is an obvious and low hanging fruit for improvement. Thanks. -- 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