Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | t3504: do check for conflict marker after failed cherry-pick | Johannes Sixt | 2020-01-27 | 1 | -2/+4 |
* | cherry-pick/revert: reject --rerere-autoupdate when continuingpw/sequence-rerere-autoupdate | Phillip Wood | 2017-08-02 | 1 | -0/+13 |
* | cherry-pick/revert: remember --rerere-autoupdate | Phillip Wood | 2017-08-02 | 1 | -7/+53 |
* | t3504: use test_commit | Phillip Wood | 2017-08-02 | 1 | -12/+9 |
* | tests: add missing && | Jonathan Nieder | 2010-11-09 | 1 | -2/+2 |
* | Make cherry-pick use rerere for conflict resolution. | Abhijit Menon-Sen | 2008-08-11 | 1 | -0/+45 |