diff: add config option relative

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

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index fb3a6e8d429acceab689dc22374e13ca0d7e314c..80d4831662c5e5fee9cdcc37e14929ce94f9b81a 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -160,6 +160,14 @@ ifndef::git-pull[]
 
 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
+       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.
+
 --allow-unrelated-histories::
        By default, `git merge` command refuses to merge histories
        that do not share a common ancestor.  This option can be