From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 18 Apr 2009 04:29:15 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.3-rc1~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2d430c713372fc21f9acf1d8b745e7f4fbbe336c;p=git.git

Merge branch 'maint'

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

2d430c713372fc21f9acf1d8b745e7f4fbbe336c