summaryrefslogtreecommitdiff
path: root/t/t7405-submodule-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2010-07-07Implement automatic fast-forward merge for submodulesLibravatar Heiko Voigt1-6/+122
2010-07-06add missing && to submodule-merge testcaseLibravatar Heiko Voigt1-1/+1
2009-04-29merge-recursive: do not die on a conflicting submoduleLibravatar Junio C Hamano1-3/+3
2009-04-05update cache for conflicting submodule entriesLibravatar Clemens Buchacher1-1/+1
2009-04-05add tests for merging with submodulesLibravatar Clemens Buchacher1-0/+74