Skip to content

Commit 14d569b

Browse files
committed
am: align placeholder for --whitespace option with apply
`git am` passes the value given to its `--whitespace` option through to the underlying `git apply`, and the value is called <action> over there. Fix the documentation for the command that calls the value <option> to say <action> instead. Note that the option help given by `git am -h` already calls the value <action>, so there is no need to make a matching change there. Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0d1bd1d commit 14d569b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Documentation/git-am.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SYNOPSIS
1212
'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify]
1313
[--[no-]3way] [--interactive] [--committer-date-is-author-date]
1414
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
15-
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
15+
[--whitespace=<action>] [-C<n>] [-p<n>] [--directory=<dir>]
1616
[--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
1717
[--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
1818
[--quoted-cr=<action>]
@@ -116,7 +116,7 @@ include::rerere-options.txt[]
116116

117117
--ignore-space-change::
118118
--ignore-whitespace::
119-
--whitespace=<option>::
119+
--whitespace=<action>::
120120
-C<n>::
121121
-p<n>::
122122
--directory=<dir>::

0 commit comments

Comments
 (0)