Merge branch 'jk/add-empty' into ei/oneline+add-empty
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Jun 2007 00:58:28 +0000 (17:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Jun 2007 00:58:28 +0000 (17:58 -0700)
* jk/add-empty:
  builtin-add: simplify (and increase accuracy of) exclude handling
  dir_struct: add collect_ignored option


Trivial merge