path: root/merge-recursive.c
AgeCommit message (Expand)Author
2010-09-15Merge branch 'ks/recursive-rename-add-identical'Junio C Hamano
2010-09-04Merge branch 'dg/local-mod-error-messages'Junio C Hamano
2010-09-03RE: [PATCH] Avoid rename/add conflict when contents are identicalSchalk, Ken
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy
2010-08-31Merge branch 'en/d-f-conflict-fix'Junio C Hamano
2010-08-22Merge branch 'hv/submodule-find-ff-merge'Junio C Hamano
2010-08-22Merge branch 'dg/local-mod-error-messages'Junio C Hamano
2010-08-20merge-recursive: Avoid excessive output for and reprocessing of renamesElijah Newren
2010-08-18Merge branch 'tf/string-list-init'Junio C Hamano
2010-08-18Merge branch 'cc/find-commit-subject'Junio C Hamano
2010-08-18merge-recursive: Fix multiple file rename across D/F conflictElijah Newren
2010-08-18merge-recursive: Fix typoElijah Newren
2010-08-11unpack_trees: group error messages by typeMatthieu Moy
2010-08-11merge-recursive: distinguish "removed" and "overwritten" messagesMatthieu Moy
2010-08-11merge-recursive: porcelain messages for checkoutDiane Gasselin
2010-08-11Turn unpack_trees_options.msgs into an array + enumMatthieu Moy
2010-08-06merge-recursive --renormalizeJonathan Nieder
2010-08-06ll-merge: let caller decide whether to renormalizeJonathan Nieder
2010-08-06ll-merge: make flag easier to populateJonathan Nieder
2010-08-06merge-trees: let caller decide whether to renormalizeJonathan Nieder
2010-08-06merge-trees: push choice to renormalize away from low levelJonathan Nieder
2010-07-23merge-recursive: use find_commit_subject() instead of custom codeChristian Couder
2010-07-09merge-recursive: use "up-to-date" instead of "uptodate" in error message for ...Nicolas Sebrecht
2010-07-09merge_recursive: Fix renames across paths below D/F conflictsElijah Newren
2010-07-09merge-recursive: Fix D/F conflictsElijah Newren
2010-07-07Implement automatic fast-forward merge for submodulesHeiko Voigt
2010-07-05string_list: Add STRING_LIST_INIT macro and make use of it.Thiago Farina
2010-07-02Try normalizing files to avoid delete/modify conflicts when mergingEyvind Bernhardsen
2010-06-27string_list: Fix argument order for string_list_lookupJulian Phillips
2010-06-27string_list: Fix argument order for string_list_insertJulian Phillips
2010-06-22Merge branch 'pc/remove-warn' into maintJunio C Hamano
2010-05-09Merge branch 'pc/remove-warn'Junio C Hamano
2010-03-28Remove a redundant errno test in a usage of remove_pathPeter Collingbourne
2010-03-21merge-recursive: add a label for ancestorJonathan Nieder
2010-03-21merge_trees(): add ancestor label parameter for diff3-style outputJonathan Nieder
2010-03-21ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder
2010-02-17refactor duplicated fill_mm() in checkout and merge-recursiveMichael Lukashov
2010-01-22Merge branch 'maint'Junio C Hamano
2010-01-22merge-recursive: do not return NULL only to cause segfaultJunio C Hamano
2010-01-21Merge branch 'ap/merge-backend-opts'Junio C Hamano
2010-01-18Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano
2010-01-18git merge -X<option>Avery Pennarun
2009-11-30Merge branch 'mm/maint-merge-ff-error-message-fix'Junio C Hamano
2009-11-30merge-recursive: make the error-message generation an extern functionMatthieu Moy
2009-11-24Merge branch 'mm/maint-hint-failed-merge'Junio C Hamano
2009-11-23merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy
2009-11-16Check the format of more printf-type functionsTarmigan Casebolt
2009-09-08merge-recursive: give less scary messages when merge did not startJunio C Hamano