diff options
| author | Ramkumar Ramachandra <artagnon@gmail.com> | 2011-08-04 16:09:11 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-04 15:41:21 -0700 |
| commit | 26ae337be11e440420d8ec7ce415425daaabe573 (patch) | |
| tree | f1a4a054c319020cab33f64a42f8faba210c92dc /Makefile | |
| parent | 21b14778a9b033d80b3e5757d9576da13ba446cd (diff) | |
| download | git-26ae337be11e440420d8ec7ce415425daaabe573.tar.gz | |
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 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -551,6 +551,7 @@ LIB_H += rerere.h LIB_H += resolve-undo.h LIB_H += revision.h LIB_H += run-command.h +LIB_H += sequencer.h LIB_H += sha1-array.h LIB_H += sha1-lookup.h LIB_H += sideband.h @@ -654,6 +655,7 @@ LIB_OBJS += revision.o LIB_OBJS += run-command.o LIB_OBJS += server-info.o LIB_OBJS += setup.o +LIB_OBJS += sequencer.o LIB_OBJS += sha1-array.o LIB_OBJS += sha1-lookup.o LIB_OBJS += sha1_file.o |