summaryrefslogtreecommitdiff
path: root/t/t7405-submodule-merge.sh
Commit message (Expand)AuthorAgeFilesLines
* submodule: process conflicting submodules only onceNicolas Morey-Chaisemartin2011-03-301-6/+52
* t7405: cd inside subshell instead of aroundJens Lehmann2010-09-031-11/+6
* Implement automatic fast-forward merge for submodulesHeiko Voigt2010-07-071-6/+122
* add missing && to submodule-merge testcaseHeiko Voigt2010-07-061-1/+1
* merge-recursive: do not die on a conflicting submoduleJunio C Hamano2009-04-291-3/+3
* update cache for conflicting submodule entriesClemens Buchacher2009-04-051-1/+1
* add tests for merging with submodulesClemens Buchacher2009-04-051-0/+74