summaryrefslogtreecommitdiffstats
path: root/git-rebase.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-04-29 17:03:20 -0700
committerJunio C Hamano <gitster@pobox.com>2020-04-29 17:03:20 -0700
commit67cc2b7cdda7af3a7079b399a8a154d094efc649 (patch)
tree9c4830195de2ffd5ecdfca15e0e04be9bf959a4e /git-rebase.html
parent0dd50943c112dfc70367bd39eb3c88371db2518f (diff)
downloadgit-htmldocs-67cc2b7cdda7af3a7079b399a8a154d094efc649.tar.gz
Autogenerated HTML docs for v2.26.2-447-gd61d2
Diffstat (limited to 'git-rebase.html')
-rw-r--r--git-rebase.html5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-rebase.html b/git-rebase.html
index 5bc247d16..891e751e5 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -1131,7 +1131,8 @@ the merge base to determine the <em>set of commits</em> which will be rebased.</
<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.
+ unchanged as a result. If a temporary stash entry was created
+ using --autostash, it will be saved to the stash reflog.
</p>
</dd>
</dl></div>
@@ -2706,7 +2707,7 @@ Use <code>--rebase-merges</code> in such scenarios instead.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2020-04-29 14:18:27 PDT
+ 2020-04-29 16:59:10 PDT
</div>
</div>
</body>