Merge branch 'rs/parse-options-with-keep-unknown-abbrev-fix'

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

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index d8f7cd7ca017f4a257129e19ea7ce407aad5c3e8..3eaefc4e940518713e7d140badcd3734ce9abbf0 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -191,7 +191,7 @@ endif::git-pull[]
 --autostash::
 --no-autostash::
        Automatically create a temporary stash entry before the operation
-       begins, record it in the special ref `MERGE_AUTOSTASH`
+       begins, record it in the 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