summaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
AgeCommit message (Expand)Author
2008-03-14Merge branch 'maint'Junio C Hamano
2008-03-12Merge branch 'lt/unpack-trees'Junio C Hamano
2008-03-11Merge branch 'jc/cherry-pick' (early part)Junio C Hamano
2008-03-09Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds
2008-03-09Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds
2008-02-27Merge branch 'db/checkout'Junio C Hamano
2008-02-10Library function to check for unmerged index entriesDaniel Barkalow
2008-02-10Build-in merge-recursiveDaniel Barkalow