From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Oct 2012 21:57:02 +0000 (-0700)
Subject: Merge branch 'nd/doc-ignore'
X-Git-Tag: v1.8.0-rc2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4321fe0b5400861b30503a8663669e96dfac0d50?hp=011504234900df47b213da2492c6a4b81ea7171c

Merge branch 'nd/doc-ignore'

* nd/doc-ignore:
gitignore.txt: suggestions how to get literal # or ! at the beginning
---

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