Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2010-03-20 | cherry-pick, revert: add a label for ancestor | Jonathan Nieder | 1 | -2/+2 |
2010-03-20 | revert: clarify label on conflict hunks | Jonathan Nieder | 1 | -2/+2 |
2010-03-20 | tests: document cherry-pick behavior in face of conflicts | Jonathan Nieder | 1 | -0/+198 |