summaryrefslogtreecommitdiffstats
path: root/git-rebase.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-12-19 16:18:36 -0800
committerJunio C Hamano <gitster@pobox.com>2016-12-19 16:18:36 -0800
commit52b1cfba6ed4a0278108ca4deaf3f7646abd1fbb (patch)
treed192843d5b628529a7b62665db83e4e79e1c347d /git-rebase.html
parent18a1532395f7adb2f9972cdc8551b3fa13f2a4a4 (diff)
downloadgit-htmldocs-52b1cfba6ed4a0278108ca4deaf3f7646abd1fbb.tar.gz
Autogenerated HTML docs for v2.11.0-161-g6610a
Diffstat (limited to 'git-rebase.html')
-rw-r--r--git-rebase.html14
1 files changed, 12 insertions, 2 deletions
diff --git a/git-rebase.html b/git-rebase.html
index 4c968744f..71bcbcca7 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -752,7 +752,7 @@ git-rebase(1) Manual Page
[&lt;upstream&gt; [&lt;branch&gt;]]
<em>git rebase</em> [-i | --interactive] [options] [--exec &lt;cmd&gt;] [--onto &lt;newbase&gt;]
--root [&lt;branch&gt;]
-<em>git rebase</em> --continue | --skip | --abort | --edit-todo</pre>
+<em>git rebase</em> --continue | --skip | --abort | --quit | --edit-todo</pre>
<div class="attribution">
</div></div>
</div>
@@ -1034,6 +1034,16 @@ leave out at most one of A and B, in which case it defaults to HEAD.</p></div>
</p>
</dd>
<dt class="hdlist1">
+--quit
+</dt>
+<dd>
+<p>
+ Abort the rebase operation but HEAD is not reset back to the
+ original branch. The index and working tree are also left
+ unchanged as a result.
+</p>
+</dd>
+<dt class="hdlist1">
--keep-empty
</dt>
<dd>
@@ -2022,7 +2032,7 @@ reorder commits tend to produce counterintuitive results.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2016-07-13 14:58:50 PDT
+Last updated 2016-12-19 16:18:00 PST
</div>
</div>
</body>