revert: Hide '-r' option in default usage
The '-r' command-line option is a no-op provided only for backward compatiblity since abd6970 (cherry-pick: make -r the default, 2006-10-05), and somehow ended up surviving across reimplementation in C at 9509af6 (Make git-revert & git-cherry-pick a builtin, 2007-03-01) and another rewrite of the command line parser at f810379 (Make builtin-revert.c use parse_options, 2007-10-07). We should have stopped advertising the option long time ago. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramkumar Ramachandra committed
Apr 10, 2011 at 21:09 UTC
5e31075a19acdd242996c83728b3c8e965af0d7b
1 file changed
+2
-1
builtin/revert.c
+2
-1
@@ -76,7 +76,8 @@ static void parse_args(int argc, const char **argv)
76
struct option options[] = {
77
OPT_BOOLEAN('n', "no-commit", &no_commit, "don't automatically commit"),
78
OPT_BOOLEAN('e', "edit", &edit, "edit the commit message"),
79
- OPT_BOOLEAN('r', NULL, &noop, "no-op (backward compatibility)"),
79
+ { OPTION_BOOLEAN, 'r', NULL, &noop, NULL, "no-op (backward compatibility)",
80
+ PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 0 },
81
OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
82
OPT_INTEGER('m', "mainline", &mainline, "parent number"),
83
OPT_RERERE_AUTOUPDATE(&allow_rerere_auto),