Merge branch 'js/pu-to-seen'

[thirdparty/git.git] / Documentation / git-merge.txt

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