Code

Merge branch 'js/filter-branch-submodule'
authorJunio C Hamano <gitster@pobox.com>
Sat, 7 Feb 2009 19:09:48 +0000 (11:09 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 7 Feb 2009 19:09:48 +0000 (11:09 -0800)
commitdf4364a42981dec067dbacfd6371d4ca910df48e
tree862033510a057a827ee2e918f83ea0f438db876f
parent7de265a4cfd2c6dbe1c7af8c592a23ede08ec854
parent26be15f09db15d2b53a13d0f184d77fb54367f33
Merge branch 'js/filter-branch-submodule'

* js/filter-branch-submodule:
  filter-branch: do not consider diverging submodules a 'dirty worktree'
  filter-branch: Fix fatal error on bare repositories
git-filter-branch.sh
t/t7003-filter-branch.sh