Merge branch 'tz/exclude-doc-smallfixes'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:34 +0000 (12:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:34 +0000 (12:20 -0700)
Doc updates.

* tz/exclude-doc-smallfixes:
  dir.c: fix typos in core.excludesfile comment
  gitignore.txt: clarify default core.excludesfile path

1  2 
dir.c

diff --cc dir.c
Simple merge