aboutsummaryrefslogtreecommitdiff
path: root/t/t7405-submodule-merge.sh
Commit message (Expand)AuthorAge
* submodule: Search for merges only at end of recursive mergeBrad King2011-10-13
* submodule: Demonstrate known breakage during recursive mergeBrad King2011-10-13
* submodule: process conflicting submodules only onceNicolas Morey-Chaisemartin2011-03-30
* t7405: cd inside subshell instead of aroundJens Lehmann2010-09-03
* Implement automatic fast-forward merge for submodulesHeiko Voigt2010-07-07
* add missing && to submodule-merge testcaseHeiko Voigt2010-07-06
* merge-recursive: do not die on a conflicting submoduleJunio C Hamano2009-04-29
* update cache for conflicting submodule entriesClemens Buchacher2009-04-05
* add tests for merging with submodulesClemens Buchacher2009-04-05