diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:44:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:44:27 -0800 |
| commit | a0f4525ae088eab15bf5ea2551df5ce2b20d28c4 (patch) | |
| tree | 2e49ffaa8e86976e4874a3f68e96d41cbd1ee4e5 | |
| parent | Merge branch 'jk/interpret-branch-name-fix' (diff) | |
| parent | gitignore doc: add global gitignore to synopsis (diff) | |
| download | tgif-a0f4525ae088eab15bf5ea2551df5ce2b20d28c4.tar.xz | |
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
| -rw-r--r-- | Documentation/gitignore.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index 205e80ef88..b08d34d84e 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 ----------- |