Merge branch 'nd/gitignore-trailing-whitespace'

Documentation update.

* nd/gitignore-trailing-whitespace:
  gitignore.txt: fix spelling of "backslash"
This commit is contained in:
Junio C Hamano 2014-11-06 10:52:40 -08:00
commit 32da67bf22

View File

@ -77,7 +77,7 @@ PATTERN FORMAT
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