aboutsummaryrefslogtreecommitdiffstats
path: root/builtin-merge-recursive.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds1-84/+0
2010-01-17Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano1-5/+5
2010-01-17git merge -X<option>Avery Pennarun1-6/+17
2009-11-10merge-{recursive,subtree}: use usagef() to print usageJonathan Nieder1-1/+1
2009-05-23MinGW: Fix compiler warning in merge-recursiveJohannes Schindelin1-2/+3
2009-01-05remove trailing LF in die() messagesAlexander Potashev1-1/+1
2008-08-30merge-recursive: introduce merge_optionsMiklos Vajna1-21/+22
2008-08-30merge-recursive.c: Add more generic merge_recursive_generic()Stephan Beyer1-45/+19
2008-08-30Split out merge_recursive() to merge-recursive.cMiklos Vajna1-1323/+4
2008-08-22Revert "Convert output messages in merge-recursive to past tense."Jonathan del Strother1-18/+18
2008-07-21Rename path_list to string_listJohannes Schindelin1-48/+48
2008-07-16Merge branch 'rs/archive'Junio C Hamano1-2/+2
2008-07-15add context pointer to read_tree_recursive()René Scharfe1-2/+2
2008-06-30Move commit_list_count() to commit.cMiklos Vajna1-8/+0
2008-06-24clone: create intermediate directories of destination repoJeff King1-11/+2
2008-06-09Merge branch 'js/merge-recursive'Junio C Hamano1-0/+11
2008-06-09merge-recursive: respect core.autocrlf when writing out the resultJohannes Schindelin1-0/+11
2008-05-25Merge branch 'js/config-cb'v1.5.6-rc0Junio C Hamano1-3/+3
2008-05-14Provide git_config with a callback-data parameterJohannes Schindelin1-3/+3
2008-05-03diff: make "too many files" rename warning optionalJeff King1-0/+1
2008-05-03bump rename limit defaultsJeff King1-1/+1
2008-05-03add merge.renamelimit config optionJeff King1-3/+10
2008-03-14Merge branch 'maint'Junio C Hamano1-2/+13
2008-03-11Merge branch 'lt/unpack-trees'Junio C Hamano1-0/+2
2008-03-11Merge branch 'jc/cherry-pick' (early part)Junio C Hamano1-365/+12
2008-03-09Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds1-1/+2
2008-03-09Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds1-0/+1
2008-02-27Merge branch 'db/checkout'Junio C Hamano1-0/+1754
2008-02-09Library function to check for unmerged index entriesDaniel Barkalow1-13/+2
2008-02-09Build-in merge-recursiveDaniel Barkalow1-0/+1762
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-12 16:39:06 +0000