diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-09 23:08:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-09 23:08:58 -0700 |
| commit | 35a5155ef556183ec87fa45c0d7314dc4e2d70b3 (patch) | |
| tree | 21d0d96ca30256180a1c409bb709cddfb03d8156 /git-am.html | |
| parent | b082a53e847d444f274aac11769b625241a41060 (diff) | |
| download | git-htmldocs-35a5155ef556183ec87fa45c0d7314dc4e2d70b3.tar.gz | |
Autogenerated HTML docs for v2.26.0-rc1
Diffstat (limited to 'git-am.html')
| -rw-r--r-- | git-am.html | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/git-am.html b/git-am.html index 62c44ae66..f06b6a693 100644 --- a/git-am.html +++ b/git-am.html @@ -756,7 +756,7 @@ git-am(1) Manual Page [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
[--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
[(<mbox> | <Maildir>)…]
-<em>git am</em> (--continue | --skip | --abort | --quit | --show-current-patch)</pre>
+<em>git am</em> (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])</pre>
<div class="attribution">
</div></div>
</div>
@@ -1090,12 +1090,14 @@ default. You can use <code>--no-utf8</code> to override this.</p></div> </p>
</dd>
<dt class="hdlist1">
---show-current-patch
+--show-current-patch[=(diff|raw)]
</dt>
<dd>
<p>
- Show the entire e-mail message "git am" has stopped at, because
- of conflicts.
+ Show the message at which <code>git am</code> has stopped due to
+ conflicts. If <code>raw</code> is specified, show the raw contents of
+ the e-mail message; if <code>diff</code>, show the diff portion only.
+ Defaults to <code>raw</code>.
</p>
</dd>
</dl></div>
@@ -1191,7 +1193,7 @@ information.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-01-08 13:13:56 PST
+ 2020-03-09 23:05:54 PDT
</div>
</div>
</body>
|