about summary refs log tree commit diff
path: root/Documentation/sequencer.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/sequencer.txt')
-rw-r--r--Documentation/sequencer.txt16
1 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/sequencer.txt b/Documentation/sequencer.txt
new file mode 100644
index 000000000000..3bceb5647411
--- /dev/null
+++ b/Documentation/sequencer.txt
@@ -0,0 +1,16 @@
+--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.
+
+--skip::
+	Skip the current commit and continue with the rest of the
+	sequence.
+
+--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.