diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:19 -0700 |
| commit | cd4093b6036af696310b1867e9e916485d53ccf4 (patch) | |
| tree | 23449c4e6c0d02bdfd050707747168fe936e5048 /Documentation/sequencer.txt | |
| parent | Merge branch 'da/make-auto-header-dependencies' (diff) | |
| parent | builtin/revert.c: make commit_list_append() static (diff) | |
| download | tgif-cd4093b6036af696310b1867e9e916485d53ccf4.tar.xz | |
Merge branch 'rr/revert-cherry-pick-continue'
* rr/revert-cherry-pick-continue:
builtin/revert.c: make commit_list_append() static
revert: Propagate errors upwards from do_pick_commit
revert: Introduce --continue to continue the operation
revert: Don't implicitly stomp pending sequencer operation
revert: Remove sequencer state when no commits are pending
reset: Make reset remove the sequencer state
revert: Introduce --reset to remove sequencer state
revert: Make pick_commits functionally act on a commit list
revert: Save command-line options for continuing operation
revert: Save data for continuing after conflict resolution
revert: Don't create invalid replay_opts in parse_args
revert: Separate cmdline parsing from functional code
revert: Introduce struct to keep command-line options
revert: Eliminate global "commit" variable
revert: Rename no_replay to record_origin
revert: Don't check lone argument in get_encoding
revert: Simplify and inline add_message_to_msg
config: Introduce functions to write non-standard file
advice: Introduce error_resolve_conflict
Diffstat (limited to 'Documentation/sequencer.txt')
| -rw-r--r-- | Documentation/sequencer.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/sequencer.txt b/Documentation/sequencer.txt new file mode 100644 index 0000000000..3e6df338be --- /dev/null +++ b/Documentation/sequencer.txt @@ -0,0 +1,9 @@ +--reset:: + Forget about the current operation in progress. Can be used + to clear the sequencer state after a failed cherry-pick or + revert. + +--continue:: + Continue the operation in progress using the information in + '.git/sequencer'. Can be used to continue after resolving + conflicts in a failed cherry-pick or revert. |