aboutsummaryrefslogtreecommitdiff
path: root/t/t3512-cherry-pick-submodule.sh
Commit message (Expand)AuthorAge
* merge-recursive: handle addition of submodule on our side of historyElijah Newren2017-11-15
* t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failureStefan Beller2017-11-12
* cherry-pick: add t3512 for submodule updatesJens Lehmann2014-07-14