From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 6 Nov 2014 18:52:40 +0000 (-0800)
Subject: Merge branch 'nd/gitignore-trailing-whitespace'
X-Git-Tag: v2.2.0-rc1~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/32da67bf222d93289bea304c92c4d2329aa17857?hp=64b9326460e066a6ae598ed53f38bec8ab4e577d

Merge branch 'nd/gitignore-trailing-whitespace'

Documentation update.

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

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