Phil Hord wrote: > In case of cherry-pick --no-commit, the > hint goes too far. It tells the user to finish up with > 'git commit'. That is not what this git-cherry-pick was > trying to do in the first place. Especially since if I do try to commit as it says, it will not reuse the old commit message and timestamp like the advice made me suspect it would. :) [...] > --- a/t/t3507-cherry-pick-conflict.sh > +++ b/t/t3507-cherry-pick-conflict.sh > @@ -59,6 +59,20 @@ test_expect_success 'advice from failed cherry-pick' " > test_i18ncmp expected actual > " > > +test_expect_success 'advice from failed cherry-pick --no-commit' " > + pristine_detach initial && > + > + picked=\$(git rev-parse --short picked) && The escaping here is obnoxiously tricky. Not your fault, though. For what it's worth, Acked-by: Jonathan Nieder <jrnieder@xxxxxxxxx> 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