summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-11-12 12:13:11 -0800
committerJunio C Hamano <gitster@pobox.com>2014-11-12 12:13:12 -0800
commit7fa1365c54c28b3cd9375539f381b54061a1880d (patch)
treea491c1b8644aac729fff4a42a2dfdd3750b81802
parentcaea1a2bb52262c64fdef545578ee7c5ceb113c5 (diff)
parent03af7cd1580b7a4d9b77c81081d6eabc0338883e (diff)
downloadgit-7fa1365c54c28b3cd9375539f381b54061a1880d.tar.gz
Merge branch 'nd/gitignore-trailing-whitespace' into maint
* nd/gitignore-trailing-whitespace: gitignore.txt: fix spelling of "backslash"
-rw-r--r--Documentation/gitignore.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 8734c1566c..09e82c31bd 100644
--- 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