diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-11-22 05:20:46 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-22 18:18:02 -0800 |
| commit | c427b211b3f5d3f967e5fc7abd526b02f83a7246 (patch) | |
| tree | 04d657ad603bfa1310a4b6cca20639e34e3b9e74 /builtin/revert.c | |
| parent | 539047c19ec040819b6f6af2d55714195b812abb (diff) | |
| download | git-c427b211b3f5d3f967e5fc7abd526b02f83a7246.tar.gz | |
revert: remove --reset compatibility optionjn/revert-quit
Remove the "git cherry-pick --reset" option, which has a different
preferred spelling nowadays ("--quit"). Luckily the old --reset name
was not around long enough for anyone to get used to it.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/revert.c')
| -rw-r--r-- | builtin/revert.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/builtin/revert.c b/builtin/revert.c index 70a5fbb672..0c61668b85 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -154,9 +154,6 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts) OPT_STRING(0, "strategy", &opts->strategy, "strategy", "merge strategy"), OPT_CALLBACK('X', "strategy-option", &opts, "option", "option for merge strategy", option_parse_x), - { OPTION_BOOLEAN, 0, "reset", &remove_state, NULL, - "alias for --quit (deprecated)", - PARSE_OPT_HIDDEN | PARSE_OPT_NOARG }, OPT_END(), OPT_END(), OPT_END(), |