Merge branch 'ei/oneline+add-empty'
commit9bee7aabcd74bf112fcdaf255551147feca8f66c
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 Jun 2007 06:32:19 +0000 (22 23:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 Jun 2007 06:32:19 +0000 (22 23:32 -0700)
tree7e880ce1ba6dc9e59a30fdc1cbdc0f3e8b0992e3
parent55f22ff22e5ff6c21b50cf379ee946f9642fc3cb
parent25fd2f7a310df17dca298a3acf2aba716ceb8ce3
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
builtin-branch.c
cache.h
commit.c