Doc: reference the "stash list" in autostash docs

In documentation pertaining to autostash behavior, we refer to the
"stash reflog". This description is too low-level as the reflog refers
to an implementation detail of how the stash works and, for end-users,
they do not need to be aware of this at all.

Change references of "stash reflog" to "stash list", which should
provide more accessible terminology for end-users.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index ec06b2f8c243d6ecaf11a0e36b160a49b5a325d6..3819fadac1f1e4daa3bc44beed5602c413830851 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -106,12 +106,12 @@ commit or stash your changes before running 'git merge'.
 `MERGE_HEAD` is present unless `MERGE_AUTOSTASH` is also present in
 which case 'git merge --abort' applies the stash entry to the worktree
 whereas 'git reset --merge' will save the stashed changes in the stash
-reflog.
+list.
 
 --quit::
        Forget about the current merge in progress. Leave the index
        and the working tree as-is. If `MERGE_AUTOSTASH` is present, the
-       stash entry will be saved to the stash reflog.
+       stash entry will be saved to the stash list.
 
 --continue::
        After a 'git merge' stops due to conflicts you can conclude the

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 794f2f39f12a23b341d1043696e26c74de67831c..4624cfd28838054f814d07366810110732e5a3bb 100644 (file)
--- 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`