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
rehsack · Jan 27, 2014 · a0f4525 · a0f4525
2 parents 4e9f932 + 2ce66e2
commit a0f4525
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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
 -----------