summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2010-07-02Try normalizing files to avoid delete/modify conflicts when mergingLibravatar Eyvind Bernhardsen1-2/+49
2010-05-08Merge branch 'pc/remove-warn'Libravatar Junio C Hamano1-1/+1
2010-03-28Remove a redundant errno test in a usage of remove_pathLibravatar Peter Collingbourne1-1/+1
2010-03-20merge-recursive: add a label for ancestorLibravatar Jonathan Nieder1-0/+1
2010-03-20merge_trees(): add ancestor label parameter for diff3-style outputLibravatar Jonathan Nieder1-3/+8
2010-03-20ll_merge(): add ancestor label parameter for diff3-style outputLibravatar Jonathan Nieder1-1/+1
2010-02-17refactor duplicated fill_mm() in checkout and merge-recursiveLibravatar Michael Lukashov1-20/+3
2010-01-21Merge branch 'maint'Libravatar Junio C Hamano1-4/+4
2010-01-21merge-recursive: do not return NULL only to cause segfaultLibravatar Junio C Hamano1-4/+4
2010-01-20Merge branch 'ap/merge-backend-opts'Libravatar Junio C Hamano1-10/+29
2010-01-17Make "subtree" part more orthogonal to the rest of merge-recursive.Libravatar Junio C Hamano1-9/+11
2010-01-17git merge -X<option>Libravatar Avery Pennarun1-2/+19
2009-11-30Merge branch 'mm/maint-merge-ff-error-message-fix'Libravatar Junio C Hamano1-18/+23
2009-11-29merge-recursive: make the error-message generation an extern functionLibravatar Matthieu Moy1-13/+18
2009-11-23Merge branch 'mm/maint-hint-failed-merge'Libravatar Junio C Hamano1-1/+7
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 19:05:32 +0000