diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-29 23:09:56 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-29 23:09:56 +0100 |
| commit | 030c2fba90190f5c4fb2d18e12a0052c44feacc4 (patch) | |
| tree | b2249c0778d8c9eda491f1ea13ee75005a3e4a1e /Documentation/git-am.txt | |
| parent | Merge branch 'mm/p4-symlink-with-lfs' (diff) | |
| parent | am: align placeholder for --whitespace option with apply (diff) | |
| download | git-030c2fba90190f5c4fb2d18e12a0052c44feacc4.tar.xz git-030c2fba90190f5c4fb2d18e12a0052c44feacc4.zip | |
Merge branch 'jc/am-doc-whitespace-action-fix'
Docfix.
* jc/am-doc-whitespace-action-fix:
am: align placeholder for --whitespace option with apply
Diffstat (limited to 'Documentation/git-am.txt')
| -rw-r--r-- | Documentation/git-am.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 0390dab20f..e080458d6c 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -12,7 +12,7 @@ SYNOPSIS 'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify] [--[no-]3way] [--interactive] [--committer-date-is-author-date] [--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] [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>] [--quoted-cr=<action>] @@ -118,7 +118,7 @@ include::rerere-options.txt[] --ignore-space-change:: --ignore-whitespace:: ---whitespace=<option>:: +--whitespace=<action>:: -C<n>:: -p<n>:: --directory=<dir>:: |