Merge branch 'mm/conflict-advice'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 2d6775c135b466ce8a95db3fd7c22c04151f8d42..76c7d9c7e53b1e8b5c688870a6d2dba840787b54 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -130,6 +130,14 @@ advice.*::
                Advice shown when linkgit:git-merge[1] refuses to
                merge to avoid overwritting local changes.
                Default: true.
+       resolveConflict::
+               Advices shown by various commands when conflicts
+               prevent the operation from being performed.
+               Default: true.
+       implicitIdentity::
+               Advice on how to set your identity configuration when
+               your information is guessed from the system username and
+               domain name. Default: true.
 --
 
 core.fileMode::