Merge branch 'jc/submodule-sync-no-auto-vivify' into maint

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 1a060ecbc8b137bff3df2c689d7e803937c66d18..6b937771994f5b0a532b6f2cc522a9d3f35c9c09 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1315,6 +1315,11 @@ interactive.singlekey::
        setting is silently ignored if portable keystroke input
        is not available.
 
+log.abbrevCommit::
+       If true, makes linkgit:git-log[1], linkgit:git-show[1], and
+       linkgit:git-whatchanged[1] assume `\--abbrev-commit`. You may
+       override this option with `\--no-abbrev-commit`.
+
 log.date::
        Set the default date-time mode for the 'log' command.
        Setting a value for log.date is similar to using 'git log''s