diff options
author | Ramkumar Ramachandra <artagnon@gmail.com> | 2011-08-04 14:39:11 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-05 02:41:21 +0400 |
commit | 26ae337be11e440420d8ec7ce415425daaabe573 (patch) | |
tree | f1a4a054c319020cab33f64a42f8faba210c92dc /Documentation/sequencer.txt | |
parent | 21b14778a9b033d80b3e5757d9576da13ba446cd (diff) |
revert: Introduce --reset to remove sequencer state
To explicitly remove the sequencer state for a fresh cherry-pick or
revert invocation, introduce a new subcommand called "--reset" to
remove the sequencer state.
Take the opportunity to publicly expose the sequencer paths, and a
generic function called "remove_sequencer_state" that various git
programs can use to remove the sequencer state in a uniform manner;
"git reset" uses it later in this series. Introducing this public API
is also in line with our long-term goal of eventually factoring out
functions from revert.c into a generic commit sequencer.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/sequencer.txt')
-rw-r--r-- | Documentation/sequencer.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/sequencer.txt b/Documentation/sequencer.txt new file mode 100644 index 0000000000..16ce88ce6b --- /dev/null +++ b/Documentation/sequencer.txt @@ -0,0 +1,4 @@ +--reset:: + Forget about the current operation in progress. Can be used + to clear the sequencer state after a failed cherry-pick or + revert. |