summaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
AgeCommit message (Expand)Author
2008-06-25clone: create intermediate directories of destination repoJeff King
2008-06-09Merge branch 'js/merge-recursive'Junio C Hamano
2008-06-09merge-recursive: respect core.autocrlf when writing out the resultJohannes Schindelin
2008-05-25Merge branch 'js/config-cb'v1.5.6-rc0Junio C Hamano
2008-05-14Provide git_config with a callback-data parameterJohannes Schindelin
2008-05-03diff: make "too many files" rename warning optionalJeff King
2008-05-03bump rename limit defaultsJeff King
2008-05-03add merge.renamelimit config optionJeff King
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
generated by cgit v0.10.2-6-g49f6 at 2024-04-16 20:29:11 (GMT)