Merge branch 'nd/doc-ignore' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Oct 2012 17:28:42 +0000 (17 10:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Oct 2012 17:28:42 +0000 (17 10:28 -0700)
* nd/doc-ignore:
  gitignore.txt: suggestions how to get literal # or ! at the beginning

1  2 
Documentation/gitignore.txt

Simple merge