diff options
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 000000000..3e6df338b --- /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. |