Jeff King <peff@xxxxxxxx> writes:
> Hmm. I was thinking "am" was the odd man out, but really there are only
> two sequencer commands that I noted: rebase and am. So you could perhaps
> argue that rebase should also learn "--resolved". Or am I forgetting
> one?
I don't think you are forgetting anything, except that "am" came first with
"resolved".
The focus of the verb is "I declare I am finished marking the resolution".
Taking that declaration and continuing is ultimately "am"'s decision. IOW
the user is not telling "am" to continue---the difference is subtle, but
it was a conscious design decision.
"rebase --continue" came later, and I think its focus is placed more
heavily on the instruction side ("Please continue"), and not on the
declaration side ("I now have marked the resolution for all paths").
This causes people sometimes to want to see it "continue", even when then
haven't marked the resolved paths as resolved. I personally think the
focus is misplaced.
But that is just a philosophical difference ;-).
--
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