diff options
| author | Michele Ballabio <barra_cuda@katamail.com> | 2009-03-18 19:05:40 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-18 19:10:19 -0700 |
| commit | 092927c1b01632d030d9d746d36ad6dd02bc3967 (patch) | |
| tree | 023b4b58b0fff5cc73738fc181692aae1e4c2c5f | |
| parent | 40bac1512b0063ad3e235bca3cb66644ccf7e510 (diff) | |
| download | git-092927c1b01632d030d9d746d36ad6dd02bc3967.tar.gz git-092927c1b01632d030d9d746d36ad6dd02bc3967.tar.xz | |
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>
| -rw-r--r-- | builtin-apply.c | 8 |
1 files changed, 4 insertions, 4 deletions
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, |