summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-05-08 14:25:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-05-08 14:25:09 -0700
commit6381c301ff5ae2c4f21f079fa4c8550667330a24 (patch)
tree62ae9c84a787f63ad6b6572843c126ab2d80d2f9 /Documentation/git-rebase.txt
parentMerge branch 'cb/avoid-colliding-with-netbsd-hmac' (diff)
parentDoc: reference the "stash list" in autostash docs (diff)
downloadtgif-6381c301ff5ae2c4f21f079fa4c8550667330a24.tar.xz
Merge branch 'dl/doc-stash-remove-mention-of-reflog'
Doc update. * dl/doc-stash-remove-mention-of-reflog: Doc: reference the "stash list" in autostash docs
Diffstat (limited to 'Documentation/git-rebase.txt')
-rw-r--r--Documentation/git-rebase.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 794f2f39f1..4624cfd288 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -257,7 +257,7 @@ See also INCOMPATIBLE OPTIONS below.
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. If a temporary stash entry was created
- using --autostash, it will be saved to the stash reflog.
+ using --autostash, it will be saved to the stash list.
--apply:
Use applying strategies to rebase (calling `git-am`