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