summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2009-11-22merge-recursive: point the user to commit when file would be overwritten.Libravatar Matthieu Moy1-1/+7
2009-11-15Check the format of more printf-type functionsLibravatar Tarmigan Casebolt1-1/+3
2009-09-08merge-recursive: give less scary messages when merge did not startLibravatar Junio C Hamano1-4/+21
2009-08-10Merge branch 'jc/maint-merge-recursive-fix'Libravatar Junio C Hamano1-3/+25
2009-07-30merge-recursive: don't segfault while handling rename clashesLibravatar Junio C Hamano1-3/+25
2009-07-06Merge branch 'tr/die_errno'Libravatar Junio C Hamano1-3/+3
2009-07-01Remove filename from conflict markersLibravatar Martin Renold1-2/+7
2009-06-27Convert existing die(..., strerror(errno)) to die_errno()Libravatar Thomas Rast1-3/+3
2009-06-20Fix various sparse warnings in the git source codeLibravatar Linus Torvalds1-1/+1
2009-05-23Merge branch 'do/maint-merge-recursive-fix'Libravatar Junio C Hamano1-5/+6
2009-05-09merge-recursive: never leave index unmerged while recursingLibravatar Dave Olszewski1-5/+6
2009-04-29merge-recursive: do not die on a conflicting submoduleLibravatar Junio C Hamano1-2/+6
2009-04-07Merge branch 'cb/maint-merge-recursive-submodule-fix'Libravatar Junio C Hamano1-12/+4
2009-04-05simplify output of conflicting mergeLibravatar Clemens Buchacher1-13/+4
2009-04-05update cache for conflicting submodule entriesLibravatar Clemens Buchacher1-2/+3
2009-03-15Fix various dead stores found by the clang static analyzerLibravatar Benjamin Kramer1-8/+3
2009-02-07tree.c: allow read_tree_recursive() to traverse gitlink entriesLibravatar Lars Hjemli1-1/+1
2009-01-13Merge branch 'js/maint-merge-recursive-r-d-conflict' into maintLibravatar Junio C Hamano1-0/+5
2009-01-13Merge branch 'cb/maint-merge-recursive-fix' into maintLibravatar Junio C Hamano1-0/+32
2009-01-07Merge branch 'js/maint-merge-recursive-r-d-conflict'Libravatar Junio C Hamano1-0/+5
2008-12-24merge-recursive: mark rename/delete conflict as unmergedLibravatar Johannes Schindelin1-0/+5
2008-12-15Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fixLibravatar Junio C Hamano1-0/+32
2008-12-04Report symlink failures in merge-recursiveLibravatar Alex Riesen1-1/+2
2008-11-23merge-recursive: use strbuf_expand() instead of interpolate()Libravatar René Scharfe1-1/+0
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