summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2008-10-19git-merge-recursive: honor merge.conflictstyle once againLibravatar Matt McCutchen1-1/+1
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerLibravatar Brandon Casey1-2/+1
2008-09-29Merge branch 'bc/master-diff-hunk-header-fix'Libravatar Shawn O. Pearce1-16/+1
2008-09-26Merge branch 'maint'Libravatar Shawn O. Pearce1-3/+1
2008-09-26Cleanup remove_pathLibravatar Alex Riesen1-5/+3
2008-09-05merge-recursive: get rid of virtual_idLibravatar Miklos Vajna1-5/+1
2008-09-04merge-recursive: move current_{file,directory}_set to struct merge_optionsLibravatar Miklos Vajna1-27/+30
2008-09-04merge-recursive: move the global obuf to struct merge_optionsLibravatar Miklos Vajna1-19/+18
2008-09-04merge-recursive: get rid of the index_only global variableLibravatar Miklos Vajna1-73/+67
2008-09-03merge-recursive: move call_depth to struct merge_optionsLibravatar Miklos Vajna1-13/+12
2008-08-30merge-recursive: introduce merge_optionsLibravatar Miklos Vajna1-132/+133
2008-08-30merge-recursive.c: Add more generic merge_recursive_generic()Libravatar Stephan Beyer1-0/+53
2008-08-30Split out merge_recursive() to merge-recursive.cLibravatar Miklos Vajna1-0/+1331
2008-02-09Build-in merge-recursiveLibravatar Daniel Barkalow1-1760/+0
2008-01-21Make on-disk index representation separate from in-core oneLibravatar Linus Torvalds1-1/+1
2008-01-16Improve use of lockfile APILibravatar Brandon Casey1-1/+1
2008-01-03Fix grammar nits in documentation and in code comments.Libravatar Jim Meyering1-1/+1
2007-12-19Improved submodule merge supportLibravatar Finn Arne Gangstad1-1/+8
2007-12-11Support a merge with conflicting gitlink changeLibravatar Junio C Hamano1-4/+6
2007-11-11Make the diff_options bitfields be an unsigned with explicit masks.Libravatar Pierre Habouzit1-1/+1
2007-10-29Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2007-10-29merge-recursive.c: mrtree in merge() is not used before setLibravatar Junio C Hamano1-1/+1
2007-10-03Merge branch 'ph/strbuf'Libravatar Junio C Hamano1-55/+39
2007-09-26Move make_cache_entry() from merge-recursive.c into read-cache.cLibravatar Carlos Rica1-24/+0
2007-09-25Make merge-recursive honor diff.renamelimitLibravatar Lars Hjemli1-0/+6
2007-09-20nfv?asprintf are broken without va_copy, workaround them.Libravatar Pierre Habouzit1-40/+35
2007-09-18Use xmemdupz() in many places.Libravatar Pierre Habouzit1-15/+4
2007-09-12Move make_cache_entry() from merge-recursive.c into read-cache.cLibravatar Carlos Rica1-24/+0
2007-08-14Use xmkstemp() instead of mkstemp()Libravatar Luiz Fernando N. Capitulino1-3/+1
2007-08-14merge-recursive: do not rudely die on binary mergeLibravatar Junio C Hamano1-23/+28
2007-08-10Start moving unpack-trees to "struct tree_desc"Libravatar Linus Torvalds1-5/+11
2007-06-13-Wold-style-definition fixLibravatar Junio C Hamano1-1/+1
2007-06-04merge-recursive: refuse to merge binary filesLibravatar Johannes Schindelin1-0/+6
2007-04-26Ignore merged status of the file-level mergeLibravatar Alex Riesen1-1/+1
2007-04-25Add a test for merging changed and rename-changed branchesLibravatar Alex Riesen1-0/+5
2007-04-25Avoid excessive rewrites in merge-recursiveLibravatar Alex Riesen1-13/+19
2007-04-21Merge branch 'jc/attr'Libravatar Junio C Hamano1-21/+382
2007-04-21Fix bogus linked-list management for user defined merge drivers.Libravatar Junio C Hamano1-1/+2
2007-04-20Kill the useless progress meter in merge-recursiveLibravatar Shawn O. Pearce1-62/+3
2007-04-19Fix working directory errno handling when unlinking a directoryLibravatar Linus Torvalds1-25/+29
2007-04-18Simplify code to find recursive merge driver.Libravatar Junio C Hamano1-7/+2
2007-04-18Counto-fix in merge-recursiveLibravatar Junio C Hamano1-1/+4
2007-04-18Fix funny types used in attribute value representationLibravatar Junio C Hamano1-7/+10
2007-04-18Allow low-level driver to specify different behaviour during internal merge.Libravatar Junio C Hamano1-0/+12
2007-04-18Custom low-level merge driver: change the configuration scheme.Libravatar Junio C Hamano1-77/+125
2007-04-18Allow the default low-level merge driver to be configured.Libravatar Junio C Hamano1-2/+12
2007-04-18Custom low-level merge driver support.Libravatar Junio C Hamano1-12/+165
2007-04-17Allow specifying specialized merge-backend per path.Libravatar Junio C Hamano1-7/+129
2007-04-17merge-recursive: separate out xdl_merge() interface.Libravatar Junio C Hamano1-21/+35
2007-04-10merge-recursive: handle D/F conflict case more carefully.Libravatar Junio C Hamano1-3/+26
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 00:27:33 +0000