Merge branch 'kb/maint-filter-branch-disappear' into maint
commit92aeb994d3195d3601df2e37052d60f9a6738b61
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Mar 2008 07:38:29 +0000 (11 00:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Mar 2008 07:38:29 +0000 (11 00:38 -0700)
treea6eb221be005f0af2eb0b16f5c4eb07cd8b0b90c
parentb50396d16cb687eccb2c2c9160b30f17e20a543f
parent5b044ac3879b0950675f0e762f1dccbbb9f4001e
Merge branch 'kb/maint-filter-branch-disappear' into maint

* kb/maint-filter-branch-disappear:
  filter-branch: handle "disappearing tree" case correctly in subdir filter