summaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
AgeCommit message (Expand)Author
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds
2010-01-18Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano
2010-01-18git merge -X<option>Avery Pennarun
2009-11-10merge-{recursive,subtree}: use usagef() to print usageJonathan Nieder
2009-05-23MinGW: Fix compiler warning in merge-recursiveJohannes Schindelin
2009-01-05remove trailing LF in die() messagesAlexander Potashev
2008-08-31merge-recursive: introduce merge_optionsMiklos Vajna
2008-08-31merge-recursive.c: Add more generic merge_recursive_generic()Stephan Beyer
2008-08-31Split out merge_recursive() to merge-recursive.cMiklos Vajna
2008-08-22Revert "Convert output messages in merge-recursive to past tense."Jonathan del Strother
2008-07-22Rename path_list to string_listJohannes Schindelin
2008-07-17Merge branch 'rs/archive'Junio C Hamano
2008-07-15add context pointer to read_tree_recursive()René Scharfe
2008-07-01Move commit_list_count() to commit.cMiklos Vajna
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