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)
commit1a15fed84a511b86feaed7731850a5629d76a97f
treed258bc56cc357e5d57b988a362f1f682524842ec
parentc927e6c69b50877e116340671ed35aaf6d3a8f49
parente96980ef8164f266308ea5fec536863a629866dc
Merge branch 'jk/add-empty' into ei/oneline+add-empty

* jk/add-empty:
  builtin-add: simplify (and increase accuracy of) exclude handling
  dir_struct: add collect_ignored option