summaryrefslogtreecommitdiffstats
path: root/git-rebase.txt
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.txt
parent0dd50943c112dfc70367bd39eb3c88371db2518f (diff)
downloadgit-htmldocs-67cc2b7cdda7af3a7079b399a8a154d094efc649.tar.gz
Autogenerated HTML docs for v2.26.2-447-gd61d2
Diffstat (limited to 'git-rebase.txt')
-rw-r--r--git-rebase.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt
index 2de862068..c70c1ec5e 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -256,7 +256,8 @@ See also INCOMPATIBLE OPTIONS below.
--quit::
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.
--apply:
Use applying strategies to rebase (calling `git-am`