Merge branch 'ns/am-to-empty'

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 8b94f19b170ba86cf44b91a5be4ceae7888b1fa7..7131ee3c66951de5981a82e304f4619de88064c5 100644 (file)
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -131,6 +131,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