Browse Source

Merge branch 'tz/exclude-doc-smallfixes'

Doc updates.

* tz/exclude-doc-smallfixes:
  dir.c: fix typos in core.excludesfile comment
  gitignore.txt: clarify default core.excludesfile path
maint
Junio C Hamano 7 years ago
parent
commit
3c5b6ee92e
  1. 2
      Documentation/gitignore.txt
  2. 2
      dir.c

2
Documentation/gitignore.txt

@ -7,7 +7,7 @@ gitignore - Specifies intentionally untracked files to ignore @@ -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
-----------

2
dir.c

@ -2498,7 +2498,7 @@ void setup_standard_excludes(struct dir_struct *dir) @@ -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))

Loading…
Cancel
Save