Age | Commit message (Expand) | Author |
---|---|---|
2020-01-27 | t3504: do check for conflict marker after failed cherry-pick | Johannes Sixt |
2017-08-03 | cherry-pick/revert: reject --rerere-autoupdate when continuing | Phillip Wood |
2017-08-03 | cherry-pick/revert: remember --rerere-autoupdate | Phillip Wood |
2017-08-03 | t3504: use test_commit | Phillip Wood |
2010-11-09 | tests: add missing && | Jonathan Nieder |
2008-08-12 | Make cherry-pick use rerere for conflict resolution. | Abhijit Menon-Sen |