summaryrefslogtreecommitdiffstats
path: root/Documentation/gitignore.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-11-06 19:52:40 +0100
committerJunio C Hamano <gitster@pobox.com>2014-11-06 19:52:40 +0100
commit32da67bf222d93289bea304c92c4d2329aa17857 (patch)
tree77eff14d0415fceb78aedb48512d02ac093c7c71 /Documentation/gitignore.txt
parentMerge branch 'tm/line-log-first-parent' (diff)
parentgitignore.txt: fix spelling of "backslash" (diff)
downloadgit-32da67bf222d93289bea304c92c4d2329aa17857.tar.xz
git-32da67bf222d93289bea304c92c4d2329aa17857.zip
Merge branch 'nd/gitignore-trailing-whitespace'
Documentation update. * nd/gitignore-trailing-whitespace: gitignore.txt: fix spelling of "backslash"
Diffstat (limited to 'Documentation/gitignore.txt')
-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