summaryrefslogtreecommitdiff
path: root/t/t3512-cherry-pick-submodule.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pw/sequencer-in-process-commit'Junio C Hamano2018-02-131-1/+0
|\
| * t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1Phillip Wood2017-11-241-1/+0
* | 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