diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-30 12:46:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-30 12:46:29 -0800 |
| commit | f0944d08eed3d3165aad9cfdcca655836aa8446e (patch) | |
| tree | 9a35cf4fa102ddc2a99e7b6b5c08b6af750decf5 /sequencer.txt | |
| parent | 6dfc7fe2b697b99b9fdec86d3cf1a567c60a18bb (diff) | |
| download | git-htmldocs-f0944d08eed3d3165aad9cfdcca655836aa8446e.tar.gz | |
Autogenerated HTML docs for v1.7.8-rc4
Diffstat (limited to 'sequencer.txt')
| -rw-r--r-- | sequencer.txt | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sequencer.txt b/sequencer.txt index 3e6df338b..5747f442f 100644 --- a/sequencer.txt +++ b/sequencer.txt @@ -1,9 +1,12 @@ ---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. + +--quit:: + Forget about the current operation in progress. Can be used + to clear the sequencer state after a failed cherry-pick or + revert. + +--abort:: + Cancel the operation and return to the pre-sequence state. |