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.html | |
parent | 33be82183d4cd6dc645f64da1402cf9a3f4cdbf3 (diff) | |
download | git-htmldocs-918a697459a240f82a16fba9fe7a606ed1d9c2a9.tar.gz |
Autogenerated HTML docs for v2.42.0-526-g3130c1
Diffstat (limited to 'git-am.html')
-rw-r--r-- | git-am.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-am.html b/git-am.html index 6f01b573c..c38311c00 100644 --- a/git-am.html +++ b/git-am.html @@ -752,7 +752,7 @@ git-am(1) Manual Page <pre class="content"><em>git am</em> [--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>]
@@ -975,7 +975,7 @@ default. You can use <code>--no-utf8</code> to override this.</p></div> --ignore-whitespace
</dt>
<dt class="hdlist1">
---whitespace=<option>
+--whitespace=<action>
</dt>
<dt class="hdlist1">
-C<n>
@@ -1289,7 +1289,7 @@ am.threeWay <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-23 14:43:46 PDT
+ 2023-10-30 08:42:00 JST
</div>
</div>
</body>
|