Merge branch 'vs/prompt-avoid-unset-variable' into maint

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 07f7295ec8b603fcbd907e780d4ed1109ac5b358..b758d5556caaeeb0a439d67c46100e5fa0d34cd4 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -11,6 +11,7 @@ SYNOPSIS
 [verse]
 'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
        [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
+       [--[no-]allow-unrelated-histories]
        [--[no-]rerere-autoupdate] [-m <msg>] [<commit>...]
 'git merge' <msg> HEAD <commit>...
 'git merge' --abort