Merge branch 'tz/exclude-doc-smallfixes'

gitster · gitster · commit 3c5b6ee92e3f · 2018-07-18T12:20:34.000-07:00
Doc updates.

* tz/exclude-doc-smallfixes:
  dir.c: fix typos in core.excludesfile comment
  gitignore.txt: clarify default core.excludesfile path
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
@@ -7,7 +7,7 @@ gitignore - Specifies intentionally untracked files to ignore
 
 SYNOPSIS
 --------
-$HOME/.config/git/ignore, $GIT_DIR/info/exclude, .gitignore
+$XDG_CONFIG_HOME/git/ignore, $GIT_DIR/info/exclude, .gitignore
 
 DESCRIPTION
 -----------
diff --git a/dir.c b/dir.c
@@ -2498,7 +2498,7 @@ void setup_standard_excludes(struct dir_struct *dir)
 {
 	dir->exclude_per_dir = ".gitignore";
 
-	/* core.excludefile defaulting to $XDG_HOME/git/ignore */
+	/* core.excludesfile defaulting to $XDG_CONFIG_HOME/git/ignore */
 	if (!excludes_file)
 		excludes_file = xdg_config_home("ignore");
 	if (excludes_file && !access_or_warn(excludes_file, R_OK, 0))

Original file line number	Diff line number	Diff line change
`@@ -2498,7 +2498,7 @@ void setup_standard_excludes(struct dir_struct *dir)`
`2498`	`2498`	`{`
`2499`	`2499`	`dir->exclude_per_dir = ".gitignore";`
`2500`	`2500`
`2501`		`- /* core.excludefile defaulting to $XDG_HOME/git/ignore */`
	`2501`	`+ /* core.excludesfile defaulting to $XDG_CONFIG_HOME/git/ignore */`
`2502`	`2502`	`if (!excludes_file)`
`2503`	`2503`	`excludes_file = xdg_config_home("ignore");`
`2504`	`2504`	`if (excludes_file && !access_or_warn(excludes_file, R_OK, 0))`