Age | Commit message (Expand) | Author |
---|---|---|
2010-03-21 | cherry-pick, revert: add a label for ancestor | Jonathan Nieder |
2010-03-21 | revert: clarify label on conflict hunks | Jonathan Nieder |
2010-03-21 | tests: document cherry-pick behavior in face of conflicts | Jonathan Nieder |