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-rebase.html | |
parent | 615c3b305d84007474d17c62d54fc18c71fdc587 (diff) | |
download | git-htmldocs-664750f03dff9b27b2c2fe5381a720967c1b60c1.tar.gz |
Autogenerated HTML docs for v2.16.2-440-gc6284
Diffstat (limited to 'git-rebase.html')
-rw-r--r-- | git-rebase.html | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/git-rebase.html b/git-rebase.html index 2dfafe70f..d7fc3a1d0 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -752,7 +752,7 @@ git-rebase(1) Manual Page [<upstream> [<branch>]]
<em>git rebase</em> [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>]
--root [<branch>]
-<em>git rebase</em> --continue | --skip | --abort | --quit | --edit-todo</pre>
+<em>git rebase</em> --continue | --skip | --abort | --quit | --edit-todo | --show-current-patch</pre>
<div class="attribution">
</div></div>
</div>
@@ -1116,6 +1116,16 @@ leave out at most one of A and B, in which case it defaults to HEAD.</p></div> </p>
</dd>
<dt class="hdlist1">
+--show-current-patch
+</dt>
+<dd>
+<p>
+ Show the current patch in an interactive rebase or when rebase
+ is stopped because of conflicts. This is the equivalent of
+ <code>git show REBASE_HEAD</code>.
+</p>
+</dd>
+<dt class="hdlist1">
-m
</dt>
<dt class="hdlist1">
@@ -2096,7 +2106,7 @@ reorder commits tend to produce counterintuitive results.</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>
|