Jonathan Nieder <jrnieder@xxxxxxxxx> writes: > I believe it is meant to support command sequences such as these: > > 1. > git cherry-pick foo; # has conflicts > ... resolve conflicts and "git add" the resolved files ... > git commit > git cherry-pick bar Why does a single commit "cherry-pick foo" leave any sequencer state that may interfere with the latter to begin with? Isn't that already a bug? > 2. > git cherry-pick foo bar; # has conflicts applying "bar" > ... resolve ... > git commit > git cherry-pick baz > > Those were intuitive things to do before the sequencer existed, and if > I understand correctly, d3f4628e was intended to support people and > scripts (such as the test suite) that have these commands wired into > their fingers. Given that the latter was broken when "foo" stopped with conficts (it lost "bar" altogether anyway), I am not worried about it, and I do not care much about anybody who had wired such multi-pick into scripts or fingers, either. IOW, I do not necessarily agree with your "those were intuitive" assertion. -- 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