Andrew's git / gitweb.git / diff
?
Merge branch 'nd/gitignore-trailing-whitespace'
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Nov 2014 18:52:40 +0000 (10:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Nov 2014 18:52:40 +0000 (10:52 -0800)
Documentation update.

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

Documentation/gitignore.txt patch | blob | history
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 8734c1566ca918e8c62f759aebdf7d0b497e860b..09e82c31bd320a162689a7f2d919de439d05375a 100644 (file)
--- 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