summaryrefslogtreecommitdiff
path: root/t/t3504-cherry-pick-rerere.sh
Commit message (Expand)AuthorAgeFilesLines
* t3504: do check for conflict marker after failed cherry-pickJohannes Sixt2020-01-271-2/+4
* cherry-pick/revert: reject --rerere-autoupdate when continuingpw/sequence-rerere-autoupdatePhillip Wood2017-08-021-0/+13
* cherry-pick/revert: remember --rerere-autoupdatePhillip Wood2017-08-021-7/+53
* t3504: use test_commitPhillip Wood2017-08-021-12/+9
* tests: add missing &&Jonathan Nieder2010-11-091-2/+2
* Make cherry-pick use rerere for conflict resolution.Abhijit Menon-Sen2008-08-111-0/+45