{"thread":{"id":"18374","subject":"[PATCH 2/2] apply: hide unused options from short help","startedAt":"2009-03-18T18:05:39Z","lastAt":"2009-03-18T18:05:40Z","messageCount":2,"participants":["Michele Ballabio"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"108394","messageId":"1237399540-27258-1-git-send-email-barra_cuda@katamail.com","threadId":"18374","inReplyTo":null,"subject":"[PATCH 1/2] apply: consistent spelling of \"don't\"","fromName":"Michele Ballabio","fromEmail":"barra_cuda@katamail.com","sentAt":"2009-03-18T18:05:39Z","receivedAt":"2009-03-18T18:05:39Z","isPatch":true,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>\n---\n builtin-apply.c |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/builtin-apply.c b/builtin-apply.c\nindex f312798..a664338 100644\n--- a/builtin-apply.c\n+++ b/builtin-apply.c\n@@ -3212,7 +3212,7 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix)\n \n \tstruct option builtin_apply_options[] = {\n \t\t{ OPTION_CALLBACK, 0, \"exclude\", NULL, \"path\",\n-\t\t\t\"don´t apply changes matching the given path\",\n+\t\t\t\"don't apply changes matching the given path\",\n \t\t\t0, option_parse_exclude },\n \t\t{ OPTION_CALLBACK, 0, \"include\", NULL, \"path\",\n \t\t\t\"apply changes matching the given path\",\n-- \n1.6.2.22.gc2ac\n"},{"id":"108393","messageId":"1237399540-27258-2-git-send-email-barra_cuda@katamail.com","threadId":"18374","inReplyTo":"1237399540-27258-1-git-send-email-barra_cuda@katamail.com","subject":"[PATCH 2/2] apply: hide unused options from short help","fromName":"Michele Ballabio","fromEmail":"barra_cuda@katamail.com","sentAt":"2009-03-18T18:05:40Z","receivedAt":"2009-03-18T18:05:40Z","isPatch":true,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"The options \"--binary\" and \"--allow-binary-replacement\" of\ngit-apply are no-op and maintained for backward compatibility,\nso avoid to show them in the short help screen.\n\nSigned-off-by: Michele Ballabio <barra_cuda@katamail.com>\n---\n builtin-apply.c |    8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/builtin-apply.c b/builtin-apply.c\nindex a664338..0e8e5ae 100644\n--- a/builtin-apply.c\n+++ b/builtin-apply.c\n@@ -3224,10 +3224,10 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix)\n \t\t\t\"ignore additions made by the patch\"),\n \t\tOPT_BOOLEAN(0, \"stat\", &diffstat,\n \t\t\t\"instead of applying the patch, output diffstat for the input\"),\n-\t\tOPT_BOOLEAN(0, \"allow-binary-replacement\", &binary,\n-\t\t\t\"now no-op\"),\n-\t\tOPT_BOOLEAN(0, \"binary\", &binary,\n-\t\t\t\"now no-op\"),\n+\t\t{ OPTION_BOOLEAN, 0, \"allow-binary-replacement\", &binary,\n+\t\t  NULL, \"old option, now no-op\", PARSE_OPT_HIDDEN },\n+\t\t{ OPTION_BOOLEAN, 0, \"binary\", &binary,\n+\t\t  NULL, \"old option, now no-op\", PARSE_OPT_HIDDEN },\n \t\tOPT_BOOLEAN(0, \"numstat\", &numstat,\n \t\t\t\"shows number of added and deleted lines in decimal notation\"),\n \t\tOPT_BOOLEAN(0, \"summary\", &summary,\n-- \n1.6.2.22.gc2ac\n"}]}