{"thread":{"id":"60396","subject":"[PATCH] am: align placeholder for --whitespace option with apply","startedAt":"2023-10-18T23:35:13Z","lastAt":"2023-10-18T23:35:13Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"483462","messageId":"xmqqwmvjzeqd.fsf@gitster.g","threadId":"60396","inReplyTo":null,"subject":"[PATCH] am: align placeholder for --whitespace option with apply","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-10-18T23:35:06Z","receivedAt":"2023-10-18T23:35:13Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"`git am` passes the value given to its `--whitespace` option through\nto the underlying `git apply`, and the value is called <action> over\nthere.  Fix the documentation for the command that calls the value\n<option> to say <action> instead.\n\nNote that the option help given by `git am -h` already calls the\nvalue <action>, so there is no need to make a matching change there.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n Documentation/git-am.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git i/Documentation/git-am.txt w/Documentation/git-am.txt\nindex 0c1dfb3c98..de3d5dde99 100644\n--- i/Documentation/git-am.txt\n+++ w/Documentation/git-am.txt\n@@ -12,7 +12,7 @@ SYNOPSIS\n 'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify]\n \t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n \t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n-\t [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]\n+\t [--whitespace=<action>] [-C<n>] [-p<n>] [--directory=<dir>]\n \t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n \t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n \t [--quoted-cr=<action>]\n@@ -116,7 +116,7 @@ include::rerere-options.txt[]\n \n --ignore-space-change::\n --ignore-whitespace::\n---whitespace=<option>::\n+--whitespace=<action>::\n -C<n>::\n -p<n>::\n --directory=<dir>::\n"}]}