# [PATCH 2/2] apply: hide unused options from short help 2 messages from 2009-03-18 to 2009-03-18. Participants: Michele Ballabio. Thread: https://gitlist.dev/t/18374 ## Michele Ballabio, 2009-03-18 18:05 Subject: [PATCH 1/2] apply: consistent spelling of "don't" Message-ID: <1237399540-27258-1-git-send-email-barra_cuda@katamail.com> URL: https://gitlist.dev/e/1237399540-27258-1-git-send-email-barra_cuda%40katamail.com ``` Signed-off-by: Michele Ballabio --- builtin-apply.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/builtin-apply.c b/builtin-apply.c index f312798..a664338 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -3212,7 +3212,7 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix) struct option builtin_apply_options[] = { { OPTION_CALLBACK, 0, "exclude", NULL, "path", - "don´t apply changes matching the given path", + "don't apply changes matching the given path", 0, option_parse_exclude }, { OPTION_CALLBACK, 0, "include", NULL, "path", "apply changes matching the given path", -- 1.6.2.22.gc2ac ``` ## Michele Ballabio, 2009-03-18 18:05 Subject: [PATCH 2/2] apply: hide unused options from short help Message-ID: <1237399540-27258-2-git-send-email-barra_cuda@katamail.com> URL: https://gitlist.dev/e/1237399540-27258-2-git-send-email-barra_cuda%40katamail.com In-Reply-To: <1237399540-27258-1-git-send-email-barra_cuda@katamail.com> ``` 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 --- builtin-apply.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin-apply.c b/builtin-apply.c index a664338..0e8e5ae 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, -- 1.6.2.22.gc2ac ```