]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 484e669 1f7d57f)
Merge branch 'ms/filter-branch-submodule'
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Feb 2010 05:48:34 +0000 (21:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Feb 2010 05:48:34 +0000 (21:48 -0800)
* ms/filter-branch-submodule:
  filter-branch: Add tests for submodules in tree-filter
  filter-branch: Fix to allow replacing submodules with another content

1  2 
git-filter-branch.sh patch | diff1 | diff2 | blob | history

diff --cc git-filter-branch.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.