summaryrefslogtreecommitdiff
path: root/t/t3512-cherry-pick-submodule.sh
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: handle addition of submodule on our side of historysb/test-cherry-pick-submodule-getting-in-a-wayElijah Newren2017-11-151-1/+1
* t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failureStefan Beller2017-11-121-0/+36
* cherry-pick: add t3512 for submodule updatesJens Lehmann2014-07-141-0/+13