Merge branch 'maint-1.6.0' into maint
[gitweb.git] / t / t7405-submodule-merge.sh
2009-04-08 Merge branch 'maint'
2009-04-08 Merge branch 'lt/reflog-expire'
2009-04-08 Merge branch 'bs/maint-1.6.0-tree-walk-prefix'
2009-04-08 Merge branch 'ms/http-auth'
2009-04-08 Merge branch 'js/maint-submodule-checkout'
2009-04-08 Merge branch 'cb/maint-merge-recursive-submodule-fix'
2009-04-05 update cache for conflicting submodule entries
2009-04-05 add tests for merging with submodules