summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-07-02 21:05:59 -0700
committerJunio C Hamano <gitster@pobox.com>2007-07-02 21:05:59 -0700
commit1a6f3999998a22325ff820bf8c840e3baf3d2281 (patch)
tree36fb5f6ce4220f7092d31e12be1b3e1706825ad0
parentdbd21447361364d646f3972738a475a92f711513 (diff)
parente8964a5b91e13169ad73c7b1db2e904441ad93f5 (diff)
downloadgit-1a6f3999998a22325ff820bf8c840e3baf3d2281.tar.gz
Merge branch 'maint'
* maint: Correctly document the name of the global excludes file configuration
-rw-r--r--Documentation/config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 50503e84b9..1d96adf30b 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -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