author | Ramkumar Ramachandra <artagnon@gmail.com> | |
Thu, 4 Aug 2011 10:39:11 +0000 (16:09 +0530) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 4 Aug 2011 22:41:21 +0000 (15:41 -0700) | ||
commit | 26ae337be11e440420d8ec7ce415425daaabe573 | |
tree | f1a4a054c319020cab33f64a42f8faba210c92dc | tree | snapshot |
parent | 21b14778a9b033d80b3e5757d9576da13ba446cd | commit | 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>
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>
Documentation/git-cherry-pick.txt | diff | blob | history | |
Documentation/git-revert.txt | diff | blob | history | |
Documentation/sequencer.txt | [new file with mode: 0644] | blob |
Makefile | diff | blob | history | |
builtin/revert.c | diff | blob | history | |
sequencer.c | [new file with mode: 0644] | blob |
sequencer.h | [new file with mode: 0644] | blob |
t/t3510-cherry-pick-sequence.sh | diff | blob | history |