aboutsummaryrefslogtreecommitdiff
path: root/builtin/revert.c
Commit message (Expand)AuthorAge
* Merge branch 'jn/merge-diff3-label'Junio C Hamano2010-04-03
|\
| * cherry-pick, revert: add a label for ancestorJonathan Nieder2010-03-20
| * revert: clarify label on conflict hunksJonathan Nieder2010-03-20
* | Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-28
|/
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-22