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

* nd/gitignore-trailing-whitespace: gitignore.txt: fix spelling of "backslash"
xu-kai-xu · Nov 12, 2014 · 7fa1365 · 7fa1365
2 parents caea1a2 + 03af7cd
commit 7fa1365
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
@@ -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