Commit message (Expand) | Author | Age | |
---|---|---|---|
* | cherry-pick/revert: reject --rerere-autoupdate when continuing | Phillip Wood | 2017-08-02 |
* | cherry-pick/revert: remember --rerere-autoupdate | Phillip Wood | 2017-08-02 |
* | t3504: use test_commit | Phillip Wood | 2017-08-02 |
* | tests: add missing && | Jonathan Nieder | 2010-11-09 |
* | Make cherry-pick use rerere for conflict resolution. | Abhijit Menon-Sen | 2008-08-11 |