From: Michele Ballabio Date: Wed, 18 Mar 2009 18:05:40 +0000 (+0100) Subject: apply: hide unused options from short help X-Git-Tag: v1.6.3-rc0~136 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=092927c1b01632d030d9d746d36ad6dd02bc3967;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin-apply.c b/builtin-apply.c index 1a02c7ce7..b52aa20cf 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -3224,10 +3224,10 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix) "ignore additions made by the patch"), OPT_BOOLEAN(0, "stat", &diffstat, "instead of applying the patch, output diffstat for the input"), - OPT_BOOLEAN(0, "allow-binary-replacement", &binary, - "now no-op"), - OPT_BOOLEAN(0, "binary", &binary, - "now no-op"), + { OPTION_BOOLEAN, 0, "allow-binary-replacement", &binary, + NULL, "old option, now no-op", PARSE_OPT_HIDDEN }, + { OPTION_BOOLEAN, 0, "binary", &binary, + NULL, "old option, now no-op", PARSE_OPT_HIDDEN }, OPT_BOOLEAN(0, "numstat", &numstat, "shows number of added and deleted lines in decimal notation"), OPT_BOOLEAN(0, "summary", &summary,