summaryrefslogtreecommitdiff
path: root/builtin/revert.c
AgeCommit message (Expand)Author
2010-05-09Merge branch 'cc/revert-strategy'Junio C Hamano
2010-05-08cherry-pick: do not dump core when iconv failsJonathan Nieder
2010-04-03Merge branch 'jn/merge-diff3-label'Junio C Hamano
2010-04-01revert: add "--strategy" option to choose merge strategyChristian Couder
2010-04-01revert: refactor merge recursive code into its own functionChristian Couder
2010-04-01revert: use strbuf to refactor the code that writes the merge messageChristian Couder
2010-03-29Merge branch 'cc/cherry-pick-ff'Junio C Hamano
2010-03-21cherry-pick, revert: add a label for ancestorJonathan Nieder
2010-03-21revert: clarify label on conflict hunksJonathan Nieder
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds