From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 Jun 2007 06:32:19 +0000 (-0700)
Subject: Merge branch 'ei/oneline+add-empty'
X-Git-Tag: v1.5.3-rc0~67
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9bee7aabcd74bf112fcdaf255551147feca8f66c;p=git.git

Merge branch 'ei/oneline+add-empty'

* ei/oneline+add-empty:
  Fix ALLOC_GROW calls with obsolete semantics
  Fix ALLOC_GROW off-by-one
  builtin-add: simplify (and increase accuracy of) exclude handling
  dir_struct: add collect_ignored option
  Extend --pretty=oneline to cover the first paragraph,
  Lift 16kB limit of log message output
---

9bee7aabcd74bf112fcdaf255551147feca8f66c