summaryrefslogtreecommitdiff
path: root/builtin/revert.c
AgeCommit message (Expand)AuthorFilesLines
2010-04-03Merge branch 'jn/merge-diff3-label'Libravatar Junio C Hamano1-39/+64
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