Skip to content

Commit f868596

Browse files
committed
Merge branch 'jc/am-doc-whitespace-action-fix' into maint-2.42
Docfix. * jc/am-doc-whitespace-action-fix: am: align placeholder for --whitespace option with apply
2 parents a40b8e9 + 14d569b commit f868596

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>]
@@ -118,7 +118,7 @@ include::rerere-options.txt[]
118118

119119
--ignore-space-change::
120120
--ignore-whitespace::
121-
--whitespace=<option>::
121+
--whitespace=<action>::
122122
-C<n>::
123123
-p<n>::
124124
--directory=<dir>::

0 commit comments

Comments
 (0)