Jonathan Nieder <jrnieder@xxxxxxxxx> writes: > After running some ill-advised command like "git cherry-pick > HEAD..linux-next", the bewildered novice may want to return to more > familiar territory. Introduce a "git cherry-pick --abort" command > that rolls back the entire cherry-pick sequence and places the > repository back on solid ground. > > Just like "git merge --abort", this internally uses "git reset > --merge", so local changes not involved in the conflict resolution are > preserved. > > Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx> > --- > ... > @@ -168,6 +265,7 @@ test_expect_success '--continue continues after conflicts are resolved' ' > OBJID > :100644 100644 OBJID OBJID M unrelated > OBJID > + :000000 100644 OBJID OBJID A bar > :000000 100644 OBJID OBJID A foo > :000000 100644 OBJID OBJID A unrelated > EOF What is this hunk about? Don't you also need another one to the test after that one? When merged with rr/revert-cherry-pick series, t3510 seems to misbehave around this area. -- 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