apply: hide unused options from short help
The options "--binary" and "--allow-binary-replacement" of git-apply are no-op and maintained for backward compatibility, so avoid to show them in the short help screen. Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michele Ballabio committed
Mar 18, 2009 at 19:05 UTC
092927c1b01632d030d9d746d36ad6dd02bc3967
1 file changed
+4
-4
builtin-apply.c
+4
-4
@@ -3224,10 +3224,10 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix)
3224
"ignore additions made by the patch"),
3225
OPT_BOOLEAN(0, "stat", &diffstat,
3226
"instead of applying the patch, output diffstat for the input"),
3227
- OPT_BOOLEAN(0, "allow-binary-replacement", &binary,
3228
- "now no-op"),
3229
- OPT_BOOLEAN(0, "binary", &binary,
3230
- "now no-op"),
3227
+ { OPTION_BOOLEAN, 0, "allow-binary-replacement", &binary,
3228
+ NULL, "old option, now no-op", PARSE_OPT_HIDDEN },
3229
+ { OPTION_BOOLEAN, 0, "binary", &binary,
3230
+ NULL, "old option, now no-op", PARSE_OPT_HIDDEN },
3231
OPT_BOOLEAN(0, "numstat", &numstat,
3232
"shows number of added and deleted lines in decimal notation"),
3233
OPT_BOOLEAN(0, "summary", &summary,