summaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano2010-01-171-5/+5
* git merge -X<option>Avery Pennarun2010-01-171-6/+17
* merge-{recursive,subtree}: use usagef() to print usageJonathan Nieder2009-11-101-1/+1
* MinGW: Fix compiler warning in merge-recursiveJohannes Schindelin2009-05-231-2/+3
* remove trailing LF in die() messagesAlexander Potashev2009-01-051-1/+1
* merge-recursive: introduce merge_optionsMiklos Vajna2008-08-301-21/+22
* merge-recursive.c: Add more generic merge_recursive_generic()Stephan Beyer2008-08-301-45/+19
* Split out merge_recursive() to merge-recursive.cMiklos Vajna2008-08-301-1323/+4
* Revert "Convert output messages in merge-recursive to past tense."Jonathan del Strother2008-08-221-18/+18
* Rename path_list to string_listJohannes Schindelin2008-07-211-48/+48
* Merge branch 'rs/archive'Junio C Hamano2008-07-161-2/+2
|\
| * add context pointer to read_tree_recursive()René Scharfe2008-07-151-2/+2
* | Move commit_list_count() to commit.cMiklos Vajna2008-06-301-8/+0
|/
* clone: create intermediate directories of destination repoJeff King2008-06-241-11/+2
* Merge branch 'js/merge-recursive'Junio C Hamano2008-06-091-0/+11
|\
| * merge-recursive: respect core.autocrlf when writing out the resultJohannes Schindelin2008-06-091-0/+11
* | Merge branch 'js/config-cb'v1.5.6-rc0Junio C Hamano2008-05-251-3/+3
|\ \
| * | Provide git_config with a callback-data parameterJohannes Schindelin2008-05-141-3/+3
| |/
* | diff: make "too many files" rename warning optionalJeff King2008-05-031-0/+1
* | bump rename limit defaultsJeff King2008-05-031-1/+1
* | add merge.renamelimit config optionJeff King2008-05-031-3/+10
|/
* Merge branch 'maint'Junio C Hamano2008-03-141-2/+13
* Merge branch 'lt/unpack-trees'Junio C Hamano2008-03-111-0/+2
|\
| * Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds2008-03-091-1/+2
| * Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds2008-03-091-0/+1
* | Merge branch 'jc/cherry-pick' (early part)Junio C Hamano2008-03-111-365/+12
|/
* Merge branch 'db/checkout'Junio C Hamano2008-02-271-5/+8
* Library function to check for unmerged index entriesDaniel Barkalow2008-02-091-13/+2
* Build-in merge-recursiveDaniel Barkalow2008-02-091-0/+1762
View Lorry Controller Status