summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-10-10 14:57:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-10-10 14:57:02 -0700
commit4321fe0b5400861b30503a8663669e96dfac0d50 (patch)
tree780b2de5ba5b48cbc4cdab9a0abe0e4860b866bf /Documentation
parentMerge branch 'jc/doc-long-options' (diff)
parentgitignore.txt: suggestions how to get literal # or ! at the beginning (diff)
downloadtgif-4321fe0b5400861b30503a8663669e96dfac0d50.tar.xz
Merge branch 'nd/doc-ignore'
* nd/doc-ignore: gitignore.txt: suggestions how to get literal # or ! at the beginning
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/gitignore.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 96639e02bd..1b82fe1969 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