summaryrefslogtreecommitdiff
path: root/Documentation/sequencer.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/sequencer.txt')
-rw-r--r--Documentation/sequencer.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/sequencer.txt b/Documentation/sequencer.txt
new file mode 100644
index 0000000000..5747f442f2
--- /dev/null
+++ b/Documentation/sequencer.txt
@@ -0,0 +1,12 @@
+--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.