update cache for conflicting submodule entries

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 19a8917b83f4ff111e9eec0767c3261a2c39d995..6ab2af4b61e2188297e15f2e3c1d9c5f05f680b8 100644 (file)
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -130,6 +130,10 @@ See also <<FILES>>.
        in the config file will cause the value to be multiplied
        by 1024, 1048576, or 1073741824 prior to output.
 
+--bool-or-int::
+       'git-config' will ensure that the output matches the format of
+       either --bool or --int, as described above.
+
 -z::
 --null::
        For all options that output values and/or keys, always