summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-09-031-45/+1
|\
| * setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy2010-09-031-1/+1
| * Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-031-45/+1
* | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-031-3/+54
|\ \
| * | merge-recursive --renormalizeJonathan Nieder2010-08-061-1/+1
| * | ll-merge: let caller decide whether to renormalizeJonathan Nieder2010-08-061-0/+1
| * | ll-merge: make flag easier to populateJonathan Nieder2010-08-061-1/+2
| * | merge-trees: let caller decide whether to renormalizeJonathan Nieder2010-08-061-1/+2
| * | merge-trees: push choice to renormalize away from low levelJonathan Nieder2010-08-061-4/+5
| * | Try normalizing files to avoid delete/modify conflicts when mergingEyvind Bernhardsen2010-07-021-2/+49
* | | Merge branch 'en/d-f-conflict-fix'Junio C Hamano2010-08-311-19/+88
|\ \ \
| * | | merge-recursive: Avoid excessive output for and reprocessing of renamesElijah Newren2010-08-201-6/+2
| * | | merge-recursive: Fix multiple file rename across D/F conflictElijah Newren2010-08-181-0/+1
| * | | merge-recursive: Fix typoElijah Newren2010-08-181-1/+1
| * | | merge_recursive: Fix renames across paths below D/F conflictsElijah Newren2010-07-091-2/+13
| * | | merge-recursive: Fix D/F conflictsElijah Newren2010-07-091-16/+77
* | | | Merge branch 'hv/submodule-find-ff-merge'Junio C Hamano2010-08-211-3/+6
|\ \ \ \
| * | | | Implement automatic fast-forward merge for submodulesHeiko Voigt2010-07-071-3/+6
* | | | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-08-211-20/+42
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | unpack_trees: group error messages by typeMatthieu Moy2010-08-111-6/+19
| * | | | merge-recursive: distinguish "removed" and "overwritten" messagesMatthieu Moy2010-08-111-5/+8
| * | | | merge-recursive: porcelain messages for checkoutDiane Gasselin2010-08-111-9/+22
| * | | | Turn unpack_trees_options.msgs into an array + enumMatthieu Moy2010-08-111-18/+11
* | | | | Merge branch 'tf/string-list-init'Junio C Hamano2010-08-181-1/+2
|\ \ \ \ \
| * | | | | string_list: Add STRING_LIST_INIT macro and make use of it.Thiago Farina2010-07-051-1/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'cc/find-commit-subject'Junio C Hamano2010-08-181-10/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | merge-recursive: use find_commit_subject() instead of custom codeChristian Couder2010-07-231-10/+4
| * | | | Merge branch 'pc/remove-warn' into maintJunio C Hamano2010-06-221-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | merge-recursive: use "up-to-date" instead of "uptodate" in error message for ...Nicolas Sebrecht2010-07-091-1/+1
| |_|/ / |/| | |
* | | | string_list: Fix argument order for string_list_lookupJulian Phillips2010-06-271-4/+4
* | | | string_list: Fix argument order for string_list_insertJulian Phillips2010-06-271-8/+8
| |_|/ |/| |
* | | Merge branch 'pc/remove-warn'Junio C Hamano2010-05-081-1/+1
|\ \ \ | |/ / |/| / | |/
| * Remove a redundant errno test in a usage of remove_pathPeter Collingbourne2010-03-281-1/+1
* | merge-recursive: add a label for ancestorJonathan Nieder2010-03-201-0/+1
* | merge_trees(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-201-3/+8
* | ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-201-1/+1
|/
* refactor duplicated fill_mm() in checkout and merge-recursiveMichael Lukashov2010-02-171-20/+3
* Merge branch 'maint'Junio C Hamano2010-01-211-4/+4
|\
| * merge-recursive: do not return NULL only to cause segfaultJunio C Hamano2010-01-211-4/+4
* | Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-201-10/+29
|\ \ | |/ |/|
| * Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano2010-01-171-9/+11
| * git merge -X<option>Avery Pennarun2010-01-171-2/+19
* | Merge branch 'mm/maint-merge-ff-error-message-fix'Junio C Hamano2009-11-301-18/+23
|\ \ | |/ |/|
| * merge-recursive: make the error-message generation an extern functionMatthieu Moy2009-11-291-13/+18
* | Merge branch 'mm/maint-hint-failed-merge'Junio C Hamano2009-11-231-1/+7
|\ \
| * | merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy2009-11-221-1/+7
| |/
* | Check the format of more printf-type functionsTarmigan Casebolt2009-11-151-1/+3
|/
* merge-recursive: give less scary messages when merge did not startJunio C Hamano2009-09-081-4/+21
* Merge branch 'jc/maint-merge-recursive-fix'Junio C Hamano2009-08-101-3/+25
|\
| * merge-recursive: don't segfault while handling rename clashesJunio C Hamano2009-07-301-3/+25
View Lorry Controller Status