summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)Author
2009-05-26Merge branch 'do/maint-merge-recursive-fix' into maintJunio C Hamano
2009-05-10merge-recursive: never leave index unmerged while recursingDave Olszewski
2009-04-29merge-recursive: do not die on a conflicting submoduleJunio C Hamano
2009-04-08Merge branch 'cb/maint-merge-recursive-submodule-fix'Junio C Hamano
2009-04-05simplify output of conflicting mergeClemens Buchacher
2009-04-05update cache for conflicting submodule entriesClemens Buchacher
2009-03-16Fix various dead stores found by the clang static analyzerBenjamin Kramer
2009-02-07tree.c: allow read_tree_recursive() to traverse gitlink entriesLars Hjemli
2009-01-07Merge branch 'js/maint-merge-recursive-r-d-conflict'Junio C Hamano
2008-12-25merge-recursive: mark rename/delete conflict as unmergedJohannes Schindelin
2008-12-15Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fixJunio C Hamano
2008-12-05Report symlink failures in merge-recursiveAlex Riesen
2008-11-24merge-recursive: use strbuf_expand() instead of interpolate()René Scharfe
2008-10-19git-merge-recursive: honor merge.conflictstyle once againMatt McCutchen
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey
2008-09-29Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce
2008-09-26Merge branch 'maint'Shawn O. Pearce
2008-09-26Cleanup remove_pathAlex Riesen
2008-09-05merge-recursive: get rid of virtual_idMiklos Vajna
2008-09-05merge-recursive: move current_{file,directory}_set to struct merge_optionsMiklos Vajna
2008-09-05merge-recursive: move the global obuf to struct merge_optionsMiklos Vajna
2008-09-05merge-recursive: get rid of the index_only global variableMiklos Vajna
2008-09-04merge-recursive: move call_depth to struct merge_optionsMiklos Vajna
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-02-10Build-in merge-recursiveDaniel Barkalow
2008-01-21Make on-disk index representation separate from in-core oneLinus Torvalds
2008-01-16Improve use of lockfile APIBrandon Casey
2008-01-03Fix grammar nits in documentation and in code comments.Jim Meyering
2007-12-20Improved submodule merge supportFinn Arne Gangstad
2007-12-11Support a merge with conflicting gitlink changeJunio C Hamano
2007-11-12Make the diff_options bitfields be an unsigned with explicit masks.Pierre Habouzit
2007-10-29Merge branch 'maint'Junio C Hamano
2007-10-29merge-recursive.c: mrtree in merge() is not used before setJunio C Hamano
2007-10-03Merge branch 'ph/strbuf'Junio C Hamano
2007-09-26Move make_cache_entry() from merge-recursive.c into read-cache.cCarlos Rica
2007-09-26Make merge-recursive honor diff.renamelimitLars Hjemli
2007-09-21nfv?asprintf are broken without va_copy, workaround them.Pierre Habouzit
2007-09-19Use xmemdupz() in many places.Pierre Habouzit
2007-09-12Move make_cache_entry() from merge-recursive.c into read-cache.cCarlos Rica
2007-08-15Use xmkstemp() instead of mkstemp()Luiz Fernando N. Capitulino
2007-08-15merge-recursive: do not rudely die on binary mergeJunio C Hamano
2007-08-10Start moving unpack-trees to "struct tree_desc"Linus Torvalds
2007-06-13-Wold-style-definition fixJunio C Hamano
2007-06-05merge-recursive: refuse to merge binary filesJohannes Schindelin
2007-04-26Ignore merged status of the file-level mergeAlex Riesen
2007-04-26Add a test for merging changed and rename-changed branchesAlex Riesen
2007-04-26Avoid excessive rewrites in merge-recursiveAlex Riesen
2007-04-22Merge branch 'jc/attr'Junio C Hamano