diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-30 08:44:11 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-30 08:44:11 +0900 |
| commit | 918a697459a240f82a16fba9fe7a606ed1d9c2a9 (patch) | |
| tree | 0ebdc5c599739be4b2c4fa4ebf0cfc1ebbbff565 /git-am.txt | |
| parent | 33be82183d4cd6dc645f64da1402cf9a3f4cdbf3 (diff) | |
| download | git-htmldocs-918a697459a240f82a16fba9fe7a606ed1d9c2a9.tar.gz | |
Autogenerated HTML docs for v2.42.0-526-g3130c1
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-am.txt b/git-am.txt index 0390dab20..e080458d6 100644 --- a/git-am.txt +++ b/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>:: |