Merge branch 'js/maint-1.6.1-filter-branch-submodule' into maint-1.6.1
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Mar 2009 04:46:50 +0000 (21:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Mar 2009 04:46:50 +0000 (21:46 -0700)
commit532b74b2104bd00cbaa99e726e6a7b8997f48744
tree0405c0e59f424878a3d4acc693c7ddac46bf3ab1
parentc26901a8ff8aa25a584551ee946516e8dc8a704a
parent26be15f09db15d2b53a13d0f184d77fb54367f33
Merge branch 'js/maint-1.6.1-filter-branch-submodule' into maint-1.6.1

* js/maint-1.6.1-filter-branch-submodule:
  filter-branch: do not consider diverging submodules a 'dirty worktree'