merge-recursive: do not die on a conflicting submodule
[git/git.git] / t / t7405-submodule-merge.sh
2009-04-29 Junio C Hamanomerge-recursive: do not die on a conflicting submodule
2009-04-28 Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-25 Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-20 Junio C HamanoMerge branch 'mm/maint-add-p-quit'
2009-04-19 Junio C HamanoMerge branch 'ef/maint-fast-export' into maint
2009-04-19 Junio C HamanoMerge branch 'mm/maint-add-p-quit' into maint
2009-04-19 Junio C HamanoMerge branch 'lt/maint-reflog-expire' into maint
2009-04-19 Junio C HamanoMerge branch 'jc/maint-shared-literally' into maint
2009-04-18 Junio C HamanoMerge branch 'lt/pack-object-memuse'
2009-04-18 Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-04-18 Junio C HamanoMerge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
2009-04-18 Junio C HamanoMerge branch 'js/maint-submodule-checkout' into maint
2009-04-18 Junio C HamanoMerge branch 'cb/maint-merge-recursive-submodule-fix...
2009-04-18 Junio C HamanoMerge branch 'da/difftool'
2009-04-18 Junio C HamanoMerge branch 'maint'
2009-04-13 Junio C HamanoMark t1301 permission test to depend on POSIXPERM
2009-04-12 Junio C HamanoMerge branch 'sb/doc-upstream-branch'
2009-04-12 Junio C HamanoMerge branch 'jk/show-upstream'
2009-04-12 Junio C HamanoMerge branch 'fg/remote-prune'
2009-04-12 Junio C HamanoMerge branch 'cc/sha1-bsearch'
2009-04-12 Junio C HamanoMerge branch 'cc/bisect-filter'
2009-04-12 Junio C HamanoMerge branch 'maint'
2009-04-09 Junio C HamanoMerge branch 'maint'
2009-04-08 Junio C HamanoMerge branch 'maint'
2009-04-08 Junio C HamanoMerge branch 'lt/reflog-expire'
2009-04-08 Junio C HamanoMerge branch 'bs/maint-1.6.0-tree-walk-prefix'
2009-04-08 Junio C HamanoMerge branch 'ms/http-auth'
2009-04-08 Junio C HamanoMerge branch 'js/maint-submodule-checkout'
2009-04-08 Junio C HamanoMerge branch 'cb/maint-merge-recursive-submodule-fix'
2009-04-05 Clemens Buchacherupdate cache for conflicting submodule entries
2009-04-05 Clemens Buchacheradd tests for merging with submodules