Merge branch 'en/pull-conflicting-options'

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

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 907327bf759d04753ce36cebc5d608c59b6548e5..86b0eeb851cb441bc32a00dca335a9f10da0b6a4 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -190,7 +190,8 @@ endif::git-pull[]
 --autostash::
 --no-autostash::
        Automatically create a temporary stash entry before the operation
-       begins, and apply it after the operation ends.  This means
+       begins, record it in the special ref `MERGE_AUTOSTASH`
+       and apply it after the operation ends.  This means
        that you can run the operation on a dirty worktree.  However, use
        with care: the final stash application after a successful
        merge might result in non-trivial conflicts.