diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-06 15:25:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-06 15:25:44 -0800 |
| commit | 664750f03dff9b27b2c2fe5381a720967c1b60c1 (patch) | |
| tree | 6960e5a2646c836d9415e1aa4aace2cea9aad4f1 /git-am.html | |
| parent | 615c3b305d84007474d17c62d54fc18c71fdc587 (diff) | |
| download | git-htmldocs-664750f03dff9b27b2c2fe5381a720967c1b60c1.tar.gz | |
Autogenerated HTML docs for v2.16.2-440-gc6284
Diffstat (limited to 'git-am.html')
| -rw-r--r-- | git-am.html | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/git-am.html b/git-am.html index eae0f018f..2d5c07024 100644 --- a/git-am.html +++ b/git-am.html @@ -755,7 +755,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)</pre>
+<em>git am</em> (--continue | --skip | --abort | --quit | --show-current-patch)</pre>
<div class="attribution">
</div></div>
</div>
@@ -1076,6 +1076,15 @@ default. You can use <code>--no-utf8</code> to override this.</p></div> untouched.
</p>
</dd>
+<dt class="hdlist1">
+--show-current-patch
+</dt>
+<dd>
+<p>
+ Show the patch being applied when "git am" is stopped because
+ of conflicts.
+</p>
+</dd>
</dl></div>
</div>
</div>
@@ -1169,7 +1178,7 @@ information.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2018-02-28 15:39:58 PST
+ 2018-03-06 15:25:02 PST
</div>
</div>
</body>
|