Yet another iteration of my patch. We have changed the series a little bit. We now have a commit that rename `reset_for_rollback` to `reset_merge`. A lot of nit-picks were handled in this revision. Thanks Rohit Rohit Ashiwal (4): sequencer: add advice for revert sequencer: rename reset_for_rollback to reset_merge cherry-pick/revert: add --skip option cherry-pick/revert: advise using --skip Documentation/git-cherry-pick.txt | 4 +- Documentation/git-revert.txt | 4 +- Documentation/sequencer.txt | 4 + builtin/commit.c | 13 +-- builtin/revert.c | 5 ++ sequencer.c | 139 ++++++++++++++++++++++++++---- sequencer.h | 1 + t/t3510-cherry-pick-sequence.sh | 122 ++++++++++++++++++++++++++ 8 files changed, 266 insertions(+), 26 deletions(-) -- 2.21.0
