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

* nd/gitignore-trailing-whitespace:
  gitignore.txt: fix spelling of "backslash"
This commit is contained in:
Junio C Hamano 2014-11-12 12:13:11 -08:00
commit 7fa1365c54
1 changed files with 1 additions and 1 deletions

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