Merge branch 'maint-1.6.4' into maint-1.6.5

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 35e72e4a380496b20d4c606a69f8fa5ad2766b10..35e26972e9da3951be99bbcd175fd57cd70651be 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -126,6 +126,10 @@ advice.*::
                Directions on how to stage/unstage/add shown in the
                output of linkgit:git-status[1] and the template shown
                when writing commit messages. Default: true.
+       commitBeforeMerge::
+               Advice shown when linkgit:git-merge[1] refuses to
+               merge to avoid overwritting local changes.
+               Default: true.
 --
 
 core.fileMode::