Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Jul 2007 04:05:59 +0000 (21:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jul 2007 04:05:59 +0000 (21:05 -0700)
* maint:
Correctly document the name of the global excludes file configuration

Documentation/config.txt
index 50503e84b92f92532d97c7730eba2a10e9e380a2..1d96adf30bd917b019424cf83f7a25365b721303 100644 (file)
@@ -275,7 +275,7 @@ You probably do not need to adjust this value.
 +
 Common unit suffixes of 'k', 'm', or 'g' are supported.
 
-core.excludeFile::
+core.excludesfile::
        In addition to '.gitignore' (per-directory) and
        '.git/info/exclude', git looks into this file for patterns
        of files which are not meant to be tracked.  See