summaryrefslogtreecommitdiff
path: root/t/t3512-cherry-pick-submodule.sh
AgeCommit message (Expand)AuthorFilesLines
2021-03-20t: mark several submodule merging tests as fixed under merge-ortLibravatar Elijah Newren1-2/+5
2020-11-19t3[5-9]*: adjust the references to the default branch name "main"Libravatar Johannes Schindelin1-2/+2
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Libravatar Johannes Schindelin1-0/+3
2020-06-12lib-submodule-update: prepend "git" to $commandLibravatar Denton Liu1-1/+1
2018-02-13Merge branch 'pw/sequencer-in-process-commit'Libravatar Junio C Hamano1-1/+0
2017-11-24t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1Libravatar Phillip Wood1-1/+0
2017-11-15merge-recursive: handle addition of submodule on our side of historyLibravatar Elijah Newren1-1/+1
2017-11-12t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failureLibravatar Stefan Beller1-0/+36
2014-07-14cherry-pick: add t3512 for submodule updatesLibravatar Jens Lehmann1-0/+13