From: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu, 16 Jan 2014 22:43:34 +0000 (-0800)
Subject: gitignore doc: add global gitignore to synopsis
X-Git-Tag: v1.9-rc1~17^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ce66e2a0a09c169fb9afcbe15f9e23c1bc28008;p=thirdparty%2Fgit.git

gitignore doc: add global gitignore to synopsis

The gitignore(5) manpage already documents $XDG_CONFIG_HOME/git/ignore
but it is easy to forget that it exists.  Add a reminder to the
synopsis.

Noticed while looking for a place to put a list of scratch filenames
in the cwd used by one's editor of choice.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index f971960512..37c94707b6 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
 -----------