summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-17 17:28:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-10-17 17:28:42 (GMT)
commit530d71011e358a43e8f8489e320081f49fe96c4f (patch)
tree30661cb313fd7cb4004189ccde3db4c3819bceee
parent352611fc2c3b6f833910043687ed441bf3fb79df (diff)
parent866f5f82b9fdedb0304708f9b78db1409fecd046 (diff)
downloadgit-530d71011e358a43e8f8489e320081f49fe96c4f.zip
git-530d71011e358a43e8f8489e320081f49fe96c4f.tar.gz
git-530d71011e358a43e8f8489e320081f49fe96c4f.tar.bz2
Merge branch 'nd/doc-ignore' into maint
* nd/doc-ignore: gitignore.txt: suggestions how to get literal # or ! at the beginning
-rw-r--r--Documentation/gitignore.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 96639e0..1b82fe1 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -74,11 +74,15 @@ PATTERN FORMAT
for readability.
- A line starting with # serves as a comment.
+ Put a backslash ("`\`") in front of the first hash for patterns
+ that begin with a hash.
- - An optional prefix '!' which negates the pattern; any
+ - An optional prefix "`!`" which negates the pattern; any
matching file excluded by a previous pattern will become
included again. If a negated pattern matches, this will
override lower precedence patterns sources.
+ Put a backslash ("`\`") in front of the first "`!`" for patterns
+ that begin with a literal "`!`", for example, "`\!important!.txt`".
- If the pattern ends with a slash, it is removed for the
purpose of the following description, but it would only find