summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2010-08-06ll-merge: let caller decide whether to renormalizeJonathan Nieder1-0/+1
2010-08-06ll-merge: make flag easier to populateJonathan Nieder1-1/+2
2010-08-06merge-trees: let caller decide whether to renormalizeJonathan Nieder1-1/+2
2010-08-06merge-trees: push choice to renormalize away from low levelJonathan Nieder1-4/+5
2010-07-23merge-recursive: use find_commit_subject() instead of custom codeChristian Couder1-10/+4
2010-07-09merge-recursive: use "up-to-date" instead of "uptodate" in error message for ...Nicolas Sebrecht1-1/+1
2010-07-09merge_recursive: Fix renames across paths below D/F conflictsElijah Newren1-2/+13
2010-07-09merge-recursive: Fix D/F conflictsElijah Newren1-16/+77
2010-07-07Implement automatic fast-forward merge for submodulesHeiko Voigt1-3/+6
2010-07-05string_list: Add STRING_LIST_INIT macro and make use of it.Thiago Farina1-1/+2
2010-07-02Try normalizing files to avoid delete/modify conflicts when mergingEyvind Bernhardsen1-2/+49
2010-06-27string_list: Fix argument order for string_list_lookupJulian Phillips1-4/+4
2010-06-27string_list: Fix argument order for string_list_insertJulian Phillips1-8/+8
2010-06-22Merge branch 'pc/remove-warn' into maintJunio C Hamano1-1/+1
2010-05-08Merge branch 'pc/remove-warn'Junio C Hamano1-1/+1
2010-03-28Remove a redundant errno test in a usage of remove_pathPeter Collingbourne1-1/+1
2010-03-20merge-recursive: add a label for ancestorJonathan Nieder1-0/+1
2010-03-20merge_trees(): add ancestor label parameter for diff3-style outputJonathan Nieder1-3/+8
2010-03-20ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder1-1/+1
2010-02-17refactor duplicated fill_mm() in checkout and merge-recursiveMichael Lukashov1-20/+3
2010-01-21Merge branch 'maint'Junio C Hamano1-4/+4
2010-01-21merge-recursive: do not return NULL only to cause segfaultJunio C Hamano1-4/+4
2010-01-20Merge branch 'ap/merge-backend-opts'Junio C Hamano1-10/+29
2010-01-17Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano1-9/+11
2010-01-17git merge -X<option>Avery Pennarun1-2/+19
2009-11-30Merge branch 'mm/maint-merge-ff-error-message-fix'Junio C Hamano1-18/+23
2009-11-29merge-recursive: make the error-message generation an extern functionMatthieu Moy1-13/+18
2009-11-23Merge branch 'mm/maint-hint-failed-merge'Junio C Hamano1-1/+7
2009-11-22merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy1-1/+7
2009-11-15Check the format of more printf-type functionsTarmigan Casebolt1-1/+3
2009-09-08merge-recursive: give less scary messages when merge did not startJunio C Hamano1-4/+21
2009-08-10Merge branch 'jc/maint-merge-recursive-fix'Junio C Hamano1-3/+25
2009-07-30merge-recursive: don't segfault while handling rename clashesJunio C Hamano1-3/+25
2009-07-06Merge branch 'tr/die_errno'Junio C Hamano1-3/+3
2009-07-01Remove filename from conflict markersMartin Renold1-2/+7
2009-06-27Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast1-3/+3
2009-06-20Fix various sparse warnings in the git source codeLinus Torvalds1-1/+1
2009-05-23Merge branch 'do/maint-merge-recursive-fix'Junio C Hamano1-5/+6
2009-05-09merge-recursive: never leave index unmerged while recursingDave Olszewski1-5/+6
2009-04-29merge-recursive: do not die on a conflicting submoduleJunio C Hamano1-2/+6
2009-04-07Merge branch 'cb/maint-merge-recursive-submodule-fix'Junio C Hamano1-12/+4
2009-04-05simplify output of conflicting mergeClemens Buchacher1-13/+4
2009-04-05update cache for conflicting submodule entriesClemens Buchacher1-2/+3
2009-03-15Fix various dead stores found by the clang static analyzerBenjamin Kramer1-8/+3
2009-02-07tree.c: allow read_tree_recursive() to traverse gitlink entriesLars Hjemli1-1/+1
2009-01-13Merge branch 'js/maint-merge-recursive-r-d-conflict' into maintJunio C Hamano1-0/+5
2009-01-13Merge branch 'cb/maint-merge-recursive-fix' into maintJunio C Hamano1-0/+32
2009-01-07Merge branch 'js/maint-merge-recursive-r-d-conflict'Junio C Hamano1-0/+5
2008-12-24merge-recursive: mark rename/delete conflict as unmergedJohannes Schindelin1-0/+5
2008-12-15Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fixJunio C Hamano1-0/+32
generated by cgit (git 2.54.0.dirty) at 2026-09-16 01:27:29 +0000