summaryrefslogtreecommitdiff
path: root/t/t3504-cherry-pick-rerere.sh
AgeCommit message (Expand)AuthorFilesLines
2021-02-10tests: remove most uses of test_i18ncmpLibravatar Ævar Arnfjörð Bjarmason1-2/+2
2020-11-19t3[5-9]*: adjust the references to the default branch name "main"Libravatar Johannes Schindelin1-13/+13
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Libravatar Johannes Schindelin1-0/+3
2020-01-27t3504: do check for conflict marker after failed cherry-pickLibravatar Johannes Sixt1-2/+4
2017-08-02cherry-pick/revert: reject --rerere-autoupdate when continuingLibravatar Phillip Wood1-0/+13
2017-08-02cherry-pick/revert: remember --rerere-autoupdateLibravatar Phillip Wood1-7/+53
2017-08-02t3504: use test_commitLibravatar Phillip Wood1-12/+9
2010-11-09tests: add missing &&Libravatar Jonathan Nieder1-2/+2
2008-08-11Make cherry-pick use rerere for conflict resolution.Libravatar Abhijit Menon-Sen1-0/+45