Merge branch 'maint'

* maint:
doc/gitattributes: clarify location of config text
Fix buffer overflow in config parser
git-apply: fix option description

diff --cc config.c
Simple merge