summaryrefslogtreecommitdiff
path: root/Documentation/gitignore.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-27 20:35:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-27 20:35:18 (GMT)
commit319a36a5c2da8dd07993caac43b7820bff3b0d37 (patch)
treedcf79cf682e76fca476ff7bea7024efda338807e /Documentation/gitignore.txt
parent8ee002fd3d875027f70729c0674282dc46fc5654 (diff)
parent24362a5d3ffc5ef10ccbcd80b258a418a1c792b5 (diff)
downloadgit-319a36a5c2da8dd07993caac43b7820bff3b0d37.zip
git-319a36a5c2da8dd07993caac43b7820bff3b0d37.tar.gz
git-319a36a5c2da8dd07993caac43b7820bff3b0d37.tar.bz2
Merge branch 'maint'
* maint: Update draft release notes for 1.5.4.5 Documentation: clarify use of .git{ignore,attributes} versus .git/info/* t/t3800-mktag.sh: use test_must_fail rather than '!' Conflicts: t/t3800-mktag.sh
Diffstat (limited to 'Documentation/gitignore.txt')
-rw-r--r--Documentation/gitignore.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index e847b3b..613dca0 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -38,6 +38,18 @@ precedence, the last matching pattern decides the outcome):
* Patterns read from the file specified by the configuration
variable 'core.excludesfile'.
+Which file to place a pattern in depends on how the pattern is meant to
+be used. Patterns which should be version-controlled and distributed to
+other repositories via clone (i.e., files that all developers will want
+to ignore) should go into a `.gitignore` file. Patterns which are
+specific to a particular repository but which do not need to be shared
+with other related repositories (e.g., auxiliary files that live inside
+the repository but are specific to one user's workflow) should go into
+the `$GIT_DIR/info/exclude` file. Patterns which a user wants git to
+ignore in all situations (e.g., backup or temporary files generated by
+the user's editor of choice) generally go into a file specified by
+`core.excludesfile` in the user's `~/.gitconfig`.
+
The underlying git plumbing tools, such as
linkgit:git-ls-files[1] and linkgit:git-read-tree[1], read
`gitignore` patterns specified by command-line options, or from