aboutsummaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
Commit message (Expand)AuthorAge
* diff: make "too many files" rename warning optionalJeff King2008-05-03
* bump rename limit defaultsJeff King2008-05-03
* add merge.renamelimit config optionJeff King2008-05-03
* Merge branch 'maint'Junio C Hamano2008-03-14
* Merge branch 'lt/unpack-trees'Junio C Hamano2008-03-11
|\
| * Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds2008-03-09
| * Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds2008-03-09
* | Merge branch 'jc/cherry-pick' (early part)Junio C Hamano2008-03-11
|/
* Merge branch 'db/checkout'Junio C Hamano2008-02-27
* Library function to check for unmerged index entriesDaniel Barkalow2008-02-09
* Build-in merge-recursiveDaniel Barkalow2008-02-09