summaryrefslogtreecommitdiff
path: root/t/t3504-cherry-pick-rerere.sh
AgeCommit message (Expand)Author
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