diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-05 13:59:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 13:59:51 -0700 |
| commit | 8fb66e5074d5cdeeb08e304be977374501a0787d (patch) | |
| tree | a10c25e0490f7bf43f512b7306ae0d5d50fbba01 /sequencer.txt | |
| parent | c94277e1611270b68bbf2d52c9679abe231cc459 (diff) | |
| download | git-htmldocs-8fb66e5074d5cdeeb08e304be977374501a0787d.tar.gz | |
Autogenerated HTML docs for v1.7.7-138-g7f41b6
Diffstat (limited to 'sequencer.txt')
| -rw-r--r-- | sequencer.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sequencer.txt b/sequencer.txt new file mode 100644 index 000000000..3e6df338b --- /dev/null +++ b/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. |