Merge branch 'tr/filter-branch'
authorJunio C Hamano <gitster@pobox.com>
Sat, 21 Nov 2009 07:46:14 +0000 (23:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 21 Nov 2009 07:46:14 +0000 (23:46 -0800)
commitaa437791d8b3d5a163777d1cabd1f299654ce712
treec34b1714c6a80d0684e74bc96bdf47a263ea6ff4
parent1973b23d284d0473795798d208f4b2fe09c0e659
parentf2f3a6b802e3dae09a1c414cd8516ff2a546a527
Merge branch 'tr/filter-branch'

* tr/filter-branch:
  filter-branch: nearest-ancestor rewriting outside subdir filter
  filter-branch: stop special-casing $filter_subdir argument