summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2010-08-27merge-recursive: options to ignore whitespace changesLibravatar Justin Frankel1-0/+6
2010-08-26merge-recursive --patienceLibravatar Justin Frankel1-0/+3
2010-08-26ll-merge: replace flag argument with options structLibravatar Jonathan Nieder1-11/+11
2010-08-26merge-recursive: expose merge options for builtin mergeLibravatar Jonathan Nieder1-0/+21
2010-08-21Merge branch 'hv/submodule-find-ff-merge'Libravatar Junio C Hamano1-3/+6
2010-08-21Merge branch 'dg/local-mod-error-messages'Libravatar Junio C Hamano1-20/+42
2010-08-20merge-recursive: Avoid excessive output for and reprocessing of renamesLibravatar Elijah Newren1-6/+2
2010-08-18Merge branch 'tf/string-list-init'Libravatar Junio C Hamano1-1/+2
2010-08-18Merge branch 'cc/find-commit-subject'Libravatar Junio C Hamano1-10/+4
2010-08-18merge-recursive: Fix multiple file rename across D/F conflictLibravatar Elijah Newren1-0/+1
2010-08-18merge-recursive: Fix typoLibravatar Elijah Newren1-1/+1
2010-08-11unpack_trees: group error messages by typeLibravatar Matthieu Moy1-6/+19
2010-08-11merge-recursive: distinguish "removed" and "overwritten" messagesLibravatar Matthieu Moy1-5/+8
2010-08-11merge-recursive: porcelain messages for checkoutLibravatar Diane Gasselin1-9/+22
2010-08-11Turn unpack_trees_options.msgs into an array + enumLibravatar Matthieu Moy1-18/+11
2010-08-06merge-recursive --renormalizeLibravatar Jonathan Nieder1-1/+1
2010-08-06ll-merge: let caller decide whether to renormalizeLibravatar Jonathan Nieder1-0/+1
2010-08-06ll-merge: make flag easier to populateLibravatar Jonathan Nieder1-1/+2
2010-08-06merge-trees: let caller decide whether to renormalizeLibravatar Jonathan Nieder1-1/+2
2010-08-06merge-trees: push choice to renormalize away from low levelLibravatar Jonathan Nieder1-4/+5
2010-07-23merge-recursive: use find_commit_subject() instead of custom codeLibravatar Christian Couder1-10/+4
2010-07-09merge-recursive: use "up-to-date" instead of "uptodate" in error message for ...Libravatar Nicolas Sebrecht1-1/+1
2010-07-09merge_recursive: Fix renames across paths below D/F conflictsLibravatar Elijah Newren1-2/+13
2010-07-09merge-recursive: Fix D/F conflictsLibravatar Elijah Newren1-16/+77
2010-07-07Implement automatic fast-forward merge for submodulesLibravatar Heiko Voigt1-3/+6
2010-07-05string_list: Add STRING_LIST_INIT macro and make use of it.Libravatar Thiago Farina1-1/+2
2010-07-02Try normalizing files to avoid delete/modify conflicts when mergingLibravatar Eyvind Bernhardsen1-2/+49
2010-06-27string_list: Fix argument order for string_list_lookupLibravatar Julian Phillips1-4/+4
2010-06-27string_list: Fix argument order for string_list_insertLibravatar Julian Phillips1-8/+8
2010-06-22Merge branch 'pc/remove-warn' into maintLibravatar Junio C Hamano1-1/+1
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 20:47:41 +0000