Merge branch 'nd/gitignore-trailing-whitespace'
commit32da67bf222d93289bea304c92c4d2329aa17857
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Nov 2014 18:52:40 +0000 (6 10:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Nov 2014 18:52:40 +0000 (6 10:52 -0800)
tree77eff14d0415fceb78aedb48512d02ac093c7c71
parent64b9326460e066a6ae598ed53f38bec8ab4e577d
parent03af7cd1580b7a4d9b77c81081d6eabc0338883e
Merge branch 'nd/gitignore-trailing-whitespace'

Documentation update.

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