summaryrefslogtreecommitdiffstats
path: root/git-am.html
diff options
context:
space:
mode:
Diffstat (limited to 'git-am.html')
-rw-r--r--git-am.html6
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=&lt;option&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;] [--directory=&lt;dir&gt;]
+ [--whitespace=&lt;action&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;] [--directory=&lt;dir&gt;]
[--exclude=&lt;path&gt;] [--include=&lt;path&gt;] [--reject] [-q | --quiet]
[--[no-]scissors] [-S[&lt;keyid&gt;]] [--patch-format=&lt;format&gt;]
[--quoted-cr=&lt;action&gt;]
@@ -975,7 +975,7 @@ default. You can use <code>--no-utf8</code> to override this.</p></div>
--ignore-whitespace
</dt>
<dt class="hdlist1">
---whitespace=&lt;option&gt;
+--whitespace=&lt;action&gt;
</dt>
<dt class="hdlist1">
-C&lt;n&gt;
@@ -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>