Merge branch 'maint'

gitster · gitster · commit 1a6f3999998a · 2007-07-02T21:05:59.000-07:00
* maint:
  Correctly document the name of the global excludes file configuration
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ You probably do not need to adjust this value.`
`275`	`275`	`+`
`276`	`276`	`Common unit suffixes of 'k', 'm', or 'g' are supported.`
`277`	`277`
`278`		`-core.excludeFile::`
	`278`	`+core.excludesfile::`
`279`	`279`	`In addition to '.gitignore' (per-directory) and`
`280`	`280`	`'.git/info/exclude', git looks into this file for patterns`
`281`	`281`	`of files which are not meant to be tracked. See`