diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-07-18 22:20:34 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-18 22:20:34 +0300 |
| commit | 3c5b6ee92e3f0a9059cd758ed32e71e41a1a55a7 (patch) | |
| tree | a3064466a914129ff6ca01f108315139017ca824 | |
| parent | 2f826b060ce5fb66714de242d9e117ecf0f63676 (diff) | |
| parent | 51d1863168ddae9010a3fcadca8f2502389fdbc2 (diff) | |
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
| -rw-r--r-- | Documentation/gitignore.txt | 2 | ||||
| -rw-r--r-- | dir.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index ff5d7f9ed6..d107daaffd 100644 --- 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 ----------- @@ -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)) |