mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/am-doc-whitespace-action-fix' into maint-2.42

Browse Source 
Docfix.

* jc/am-doc-whitespace-action-fix:
  am: align placeholder for --whitespace option with apply
This commit is contained in:
Junio C Hamano
2023-11-02 16:53:27 +09:00
parent a40b8e9197 14d569b1a7
commit f8685969f5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-am.txt
View File

@ -12,7 +12,7 @@ SYNOPSIS
'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify] 'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify]
[--[no-]3way] [--interactive] [--committer-date-is-author-date] [--[no-]3way] [--interactive] [--committer-date-is-author-date]
[--ignore-date] [--ignore-space-change | --ignore-whitespace] [--ignore-date] [--ignore-space-change | --ignore-whitespace]
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] [--whitespace=<action>] [-C<n>] [-p<n>] [--directory=<dir>]
[--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet] [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
[--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>] [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
[--quoted-cr=<action>] [--quoted-cr=<action>]
@ -118,7 +118,7 @@ include::rerere-options.txt[]
--ignore-space-change:: --ignore-space-change::
--ignore-whitespace:: --ignore-whitespace::
--whitespace=<option>:: --whitespace=<action>::
-C<n>:: -C<n>::
-p<n>:: -p<n>::
--directory=<dir>:: --directory=<dir>::