Hi, Apart from the minor style changes, there are two big hilights in this iteration of the series: 1. The "--continue complains when there are unresolved conflicts" test is fixed. I'd written "base..picked" instead of "base..anotherpick" earlier. 2. Special handling for the last line in the instruction sheet (when it is not terminated by a newline). See [1] for an especially convincing explanation from Junio. All the changes made in this iteration are a direct result of Christian's reviews -- a big thanks. Thanks for reading. -- Ram [1]: http://mid.gmane.org/7v4o1ycsi4.fsf@xxxxxxxxxxxxxxxxxxxxxxxx Ramkumar Ramachandra (18): advice: Introduce error_resolve_conflict config: Introduce functions to write non-standard file revert: Simplify and inline add_message_to_msg revert: Don't check lone argument in get_encoding revert: Rename no_replay to record_origin revert: Eliminate global "commit" variable revert: Introduce struct to keep command-line options revert: Separate cmdline parsing from functional code revert: Don't create invalid replay_opts in parse_args revert: Save data for continuing after conflict resolution revert: Save command-line options for continuing operation revert: Make pick_commits functionally act on a commit list revert: Introduce --reset to remove sequencer state reset: Make reset remove the sequencer state revert: Remove sequencer state when no commits are pending revert: Don't implicitly stomp pending sequencer operation revert: Introduce --continue to continue the operation revert: Propagate errors upwards from do_pick_commit Documentation/git-cherry-pick.txt | 6 + Documentation/git-revert.txt | 6 + Documentation/sequencer.txt | 9 + Makefile | 2 + advice.c | 31 ++- advice.h | 3 +- branch.c | 2 + builtin/revert.c | 737 +++++++++++++++++++++++++++++-------- cache.h | 2 + config.c | 36 ++- sequencer.c | 19 + sequencer.h | 20 + t/7106-reset-sequence.sh | 44 +++ t/t3510-cherry-pick-sequence.sh | 214 +++++++++++ 14 files changed, 960 insertions(+), 171 deletions(-) create mode 100644 Documentation/sequencer.txt create mode 100644 sequencer.c create mode 100644 sequencer.h create mode 100755 t/7106-reset-sequence.sh create mode 100755 t/t3510-cherry-pick-sequence.sh -- 1.7.6.351.gb35ac.dirty -- 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