Merge branch 'maint-1.6.1' into maint

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 28e1861094a1689cdb042df6b1d788620ffdf213..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
@@ -279,7 +283,7 @@ If you want to know all the values for a multivar, do:
 % git config --get-all core.gitproxy
 ------------
 
-If you like to live dangerous, you can replace *all* core.gitproxy by a
+If you like to live dangerously, you can replace *all* core.gitproxy by a
 new one with
 
 ------------