Merge branch 'ei/oneline+add-empty'
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 Jun 2007 06:32:19 +0000 (23:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 Jun 2007 06:32:19 +0000 (23:32 -0700)
* 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

1  2 
builtin-branch.c
cache.h
commit.c

Simple merge
diff --cc cache.h
Simple merge
diff --cc commit.c
Simple merge