summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-27 18:44:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-01-27 18:44:27 (GMT)
commita0f4525ae088eab15bf5ea2551df5ce2b20d28c4 (patch)
tree2e49ffaa8e86976e4874a3f68e96d41cbd1ee4e5 /Documentation
parent4e9f9320e3238ea32df84010dae45d01923a0de5 (diff)
parent2ce66e2a0a09c169fb9afcbe15f9e23c1bc28008 (diff)
downloadgit-a0f4525ae088eab15bf5ea2551df5ce2b20d28c4.zip
git-a0f4525ae088eab15bf5ea2551df5ce2b20d28c4.tar.gz
git-a0f4525ae088eab15bf5ea2551df5ce2b20d28c4.tar.bz2
Merge branch 'jn/ignore-doc'
Explicitly list $HOME/.config/git/ignore as one of the places you can use to keep ignore patterns that depend on your personal choice of tools, e.g. *~ for Emacs users. * jn/ignore-doc: gitignore doc: add global gitignore to synopsis
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/gitignore.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 205e80e..b08d34d 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -7,7 +7,7 @@ gitignore - Specifies intentionally untracked files to ignore
SYNOPSIS
--------
-$GIT_DIR/info/exclude, .gitignore
+$HOME/.config/git/ignore, $GIT_DIR/info/exclude, .gitignore
DESCRIPTION
-----------