From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Feb 2010 05:48:34 +0000 (-0800)
Subject: Merge branch 'ms/filter-branch-submodule'
X-Git-Tag: v1.7.0-rc2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b7acc186f33037178f4d137b2e6099c67492bde;p=thirdparty%2Fgit.git

Merge branch 'ms/filter-branch-submodule'

* ms/filter-branch-submodule:
  filter-branch: Add tests for submodules in tree-filter
  filter-branch: Fix to allow replacing submodules with another content
---

4b7acc186f33037178f4d137b2e6099c67492bde