Merge branch 'maint' to synchronize with 1.5.0.6

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 68de5881bd36aabd1b4b13c2bce48a226c34788e..c759efb7fc6ebb69d9c6b59e23e31f33e0596675 100644 (file)
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -86,7 +86,7 @@ OPTIONS
        Remove the line matching the key from config file.
 
 --unset-all::
-       Remove all matching lines from config file.
+       Remove all lines matching the key from config file.
 
 -l, --list::
        List all variables set in config file.