summaryrefslogtreecommitdiff
path: root/t/t3504-cherry-pick-rerere.sh
AgeCommit message (Expand)Author
2021-02-11tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason
2020-11-19t3[5-9]*: adjust the references to the default branch name "main"Johannes Schindelin
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2020-01-27t3504: do check for conflict marker after failed cherry-pickJohannes Sixt
2017-08-02cherry-pick/revert: reject --rerere-autoupdate when continuingPhillip Wood
2017-08-02cherry-pick/revert: remember --rerere-autoupdatePhillip Wood
2017-08-02t3504: use test_commitPhillip Wood
2010-11-09tests: add missing &&Jonathan Nieder
2008-08-11Make cherry-pick use rerere for conflict resolution.Abhijit Menon-Sen