summaryrefslogtreecommitdiff
path: root/builtin/revert.c
AgeCommit message (Expand)AuthorFilesLines
2010-05-08Merge branch 'cc/revert-strategy'Libravatar Junio C Hamano1-74/+105
2010-05-08cherry-pick: do not dump core when iconv failsLibravatar Jonathan Nieder1-2/+7
2010-04-03Merge branch 'jn/merge-diff3-label'Libravatar Junio C Hamano1-39/+64
2010-04-01revert: add "--strategy" option to choose merge strategyLibravatar Christian Couder1-2/+23
2010-04-01revert: refactor merge recursive code into its own functionLibravatar Christian Couder1-48/+58
2010-04-01revert: use strbuf to refactor the code that writes the merge messageLibravatar Christian Couder1-36/+34
2010-03-28Merge branch 'cc/cherry-pick-ff'Libravatar Junio C Hamano1-4/+42
2010-03-20cherry-pick, revert: add a label for ancestorLibravatar Jonathan Nieder1-1/+4
2010-03-20revert: clarify label on conflict hunksLibravatar Jonathan Nieder1-39/+62
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+460