From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Nov 2014 20:13:11 +0000 (-0800)
Subject: Merge branch 'nd/gitignore-trailing-whitespace' into maint
X-Git-Tag: v2.2.0-rc2~2^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7fa1365c54c28b3cd9375539f381b54061a1880d?ds=inline;hp=-c

Merge branch 'nd/gitignore-trailing-whitespace' into maint

* nd/gitignore-trailing-whitespace:
gitignore.txt: fix spelling of "backslash"
---

7fa1365c54c28b3cd9375539f381b54061a1880d
diff --combined Documentation/gitignore.txt
index 8734c1566c,82b7e0b151..09e82c31bd
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@@ -7,7 -7,7 +7,7 @@@ gitignore - Specifies intentionally unt
  
  SYNOPSIS
  --------
 -$GIT_DIR/info/exclude, .gitignore
 +$HOME/.config/git/ignore, $GIT_DIR/info/exclude, .gitignore
  
  DESCRIPTION
  -----------
@@@ -77,15 -77,13 +77,15 @@@ PATTERN FORMA
     Put a backslash ("`\`") in front of the first hash for patterns
     that begin with a hash.
  
-  - Trailing spaces are ignored unless they are quoted with backlash
+  - Trailing spaces are ignored unless they are quoted with backslash
     ("`\`").
  
   - 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.
 +   included again. It is not possible to re-include a file if a parent
 +   directory of that file is excluded. Git doesn't list excluded
 +   directories for performance reasons, so any patterns on contained
 +   files have no effect, no matter where they are defined.
     Put a backslash ("`\`") in front of the first "`!`" for patterns
     that begin with a literal "`!`", for example, "`\!important!.txt`".
  
@@@ -187,19 -185,6 +187,19 @@@ Another example
  The second .gitignore prevents Git from ignoring
  `arch/foo/kernel/vmlinux.lds.S`.
  
 +Example to exclude everything except a specific directory `foo/bar`
 +(note the `/*` - without the slash, the wildcard would also exclude
 +everything within `foo/bar`):
 +
 +--------------------------------------------------------------
 +    $ cat .gitignore
 +    # exclude everything except directory foo/bar
 +    /*
 +    !/foo
 +    /foo/*
 +    !/foo/bar
 +--------------------------------------------------------------
 +
  SEE ALSO
  --------
  linkgit:git-rm[1],