On Thu, Oct 6, 2011 at 5:55 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Jay Soffian <jaysoffian@xxxxxxxxx> writes: > >> On Thu, Oct 6, 2011 at 1:48 PM, Jay Soffian <jaysoffian@xxxxxxxxx> wrote: >>> Note that do_recursive_merge() aborts if the merge cannot start, while >>> try_merge_command() returns a non-zero value other than 1. >> >> Maybe you want this on-top: > > Good thinking. > > commit 4ed15ff067b548011b1eda8b12d46d887c4f056c > Author: Jay Soffian <jaysoffian@xxxxxxxxx> > Date: Thu Oct 6 13:58:01 2011 -0400 > > cherry-pick: do not give irrelevant advice when cherry-pick punted > > If a cherry-pick did not even start because the working tree had local > changes that would overlap with the operation, we shouldn't be advising > the users to resolve conflicts nor to conclude it with "git commit". > > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> > > Thanks. Care to sign-off? Signed-off-by: Jay Soffian <jaysoffian@xxxxxxxxx> Thank you for making it a proper commit. :-) j. -- 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