summaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2008-06-09Merge branch 'js/merge-recursive'Libravatar Junio C Hamano1-0/+11
2008-06-09merge-recursive: respect core.autocrlf when writing out the resultLibravatar Johannes Schindelin1-0/+11
2008-05-25Merge branch 'js/config-cb'Libravatar Junio C Hamano1-3/+3
2008-05-14Provide git_config with a callback-data parameterLibravatar Johannes Schindelin1-3/+3
2008-05-03diff: make "too many files" rename warning optionalLibravatar Jeff King1-0/+1
2008-05-03bump rename limit defaultsLibravatar Jeff King1-1/+1
2008-05-03add merge.renamelimit config optionLibravatar Jeff King1-3/+10
2008-03-14Merge branch 'maint'Libravatar Junio C Hamano1-2/+13
2008-03-11Merge branch 'lt/unpack-trees'Libravatar Junio C Hamano1-0/+2
2008-03-11Merge branch 'jc/cherry-pick' (early part)Libravatar Junio C Hamano1-365/+12
2008-03-09Make 'unpack_trees()' have a separate source and destination indexLibravatar Linus Torvalds1-1/+2
2008-03-09Make 'unpack_trees()' take the index to work on as an argumentLibravatar Linus Torvalds1-0/+1
2008-02-27Merge branch 'db/checkout'Libravatar Junio C Hamano1-0/+1754
2008-02-09Library function to check for unmerged index entriesLibravatar Daniel Barkalow1-13/+2
2008-02-09Build-in merge-recursiveLibravatar Daniel Barkalow1-0/+1762
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 05:27:49 +0000