| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'ks/recursive-rename-add-identical' | Junio C Hamano | 2010-09-15 | 1 | -0/+6 |
| |\ |
|
| | * | RE: [PATCH] Avoid rename/add conflict when contents are identical | Schalk, Ken | 2010-09-03 | 1 | -0/+6 |
| * | | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 2010-09-03 | 1 | -45/+1 |
| |\ \ |
|
| | * | | setup_unpack_trees_porcelain: take the whole options struct as parameter | Matthieu Moy | 2010-09-03 | 1 | -1/+1 |
| | * | | Move set_porcelain_error_msgs to unpack-trees.c and rename it | Matthieu Moy | 2010-09-03 | 1 | -45/+1 |
| * | | | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 2010-09-03 | 1 | -3/+54 |
| |\ \ \ |
|
| | * | | | merge-recursive --renormalize | Jonathan Nieder | 2010-08-06 | 1 | -1/+1 |
| | * | | | ll-merge: let caller decide whether to renormalize | Jonathan Nieder | 2010-08-06 | 1 | -0/+1 |
| | * | | | ll-merge: make flag easier to populate | Jonathan Nieder | 2010-08-06 | 1 | -1/+2 |
| | * | | | merge-trees: let caller decide whether to renormalize | Jonathan Nieder | 2010-08-06 | 1 | -1/+2 |
| | * | | | merge-trees: push choice to renormalize away from low level | Jonathan Nieder | 2010-08-06 | 1 | -4/+5 |
| | * | | | Try normalizing files to avoid delete/modify conflicts when merging | Eyvind Bernhardsen | 2010-07-02 | 1 | -2/+49 |
| * | | | | Merge branch 'en/d-f-conflict-fix' | Junio C Hamano | 2010-08-31 | 1 | -19/+88 |
| |\ \ \ \ |
|
| | * | | | | merge-recursive: Avoid excessive output for and reprocessing of renames | Elijah Newren | 2010-08-20 | 1 | -6/+2 |
| | * | | | | merge-recursive: Fix multiple file rename across D/F conflict | Elijah Newren | 2010-08-18 | 1 | -0/+1 |
| | * | | | | merge-recursive: Fix typo | Elijah Newren | 2010-08-18 | 1 | -1/+1 |
| | * | | | | merge_recursive: Fix renames across paths below D/F conflicts | Elijah Newren | 2010-07-09 | 1 | -2/+13 |
| | * | | | | merge-recursive: Fix D/F conflicts | Elijah Newren | 2010-07-09 | 1 | -16/+77 |
| * | | | | | Merge branch 'hv/submodule-find-ff-merge' | Junio C Hamano | 2010-08-21 | 1 | -3/+6 |
| |\ \ \ \ \ |
|
| | * | | | | | Implement automatic fast-forward merge for submodules | Heiko Voigt | 2010-07-07 | 1 | -3/+6 |
| * | | | | | | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 2010-08-21 | 1 | -20/+42 |
| |\ \ \ \ \ \
| | |_|_|/ /
| |/| | | | |
|
| | * | | | | | unpack_trees: group error messages by type | Matthieu Moy | 2010-08-11 | 1 | -6/+19 |
| | * | | | | | merge-recursive: distinguish "removed" and "overwritten" messages | Matthieu Moy | 2010-08-11 | 1 | -5/+8 |
| | * | | | | | merge-recursive: porcelain messages for checkout | Diane Gasselin | 2010-08-11 | 1 | -9/+22 |
| | * | | | | | Turn unpack_trees_options.msgs into an array + enum | Matthieu Moy | 2010-08-11 | 1 | -18/+11 |
| | | |_|_|/
| |/| | | |
|
| * | | | | | Merge branch 'tf/string-list-init' | Junio C Hamano | 2010-08-18 | 1 | -1/+2 |
| |\ \ \ \ \ |
|
| | * | | | | | string_list: Add STRING_LIST_INIT macro and make use of it. | Thiago Farina | 2010-07-05 | 1 | -1/+2 |
| | | |/ / /
| |/| | | |
|
| * | | | | | Merge branch 'cc/find-commit-subject' | Junio C Hamano | 2010-08-18 | 1 | -10/+4 |
| |\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| | * | | | | merge-recursive: use find_commit_subject() instead of custom code | Christian Couder | 2010-07-23 | 1 | -10/+4 |
| | * | | | | Merge branch 'pc/remove-warn' into maint | Junio C Hamano | 2010-06-22 | 1 | -1/+1 |
| | |\ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | | merge-recursive: use "up-to-date" instead of "uptodate" in error message for ... | Nicolas Sebrecht | 2010-07-09 | 1 | -1/+1 |
| | |_|/ /
|/| | | |
|
| * | | | | string_list: Fix argument order for string_list_lookup | Julian Phillips | 2010-06-27 | 1 | -4/+4 |
| * | | | | string_list: Fix argument order for string_list_insert | Julian Phillips | 2010-06-27 | 1 | -8/+8 |
| | |_|/
|/| | |
|
| * | | | Merge branch 'pc/remove-warn' | Junio C Hamano | 2010-05-08 | 1 | -1/+1 |
| |\ \ \
| |/ /
|/| /
| |/ |
|
| | * | Remove a redundant errno test in a usage of remove_path | Peter Collingbourne | 2010-03-28 | 1 | -1/+1 |
| * | | merge-recursive: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 1 | -0/+1 |
| * | | merge_trees(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2010-03-20 | 1 | -3/+8 |
| * | | ll_merge(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2010-03-20 | 1 | -1/+1 |
| |/ |
|
| * | refactor duplicated fill_mm() in checkout and merge-recursive | Michael Lukashov | 2010-02-17 | 1 | -20/+3 |
| * | Merge branch 'maint' | Junio C Hamano | 2010-01-21 | 1 | -4/+4 |
| |\ |
|
| | * | merge-recursive: do not return NULL only to cause segfault | Junio C Hamano | 2010-01-21 | 1 | -4/+4 |
| * | | Merge branch 'ap/merge-backend-opts' | Junio C Hamano | 2010-01-20 | 1 | -10/+29 |
| |\ \
| |/
|/| |
|
| | * | Make "subtree" part more orthogonal to the rest of merge-recursive. | Junio C Hamano | 2010-01-17 | 1 | -9/+11 |
| | * | git merge -X<option> | Avery Pennarun | 2010-01-17 | 1 | -2/+19 |
| * | | Merge branch 'mm/maint-merge-ff-error-message-fix' | Junio C Hamano | 2009-11-30 | 1 | -18/+23 |
| |\ \
| |/
|/| |
|
| | * | merge-recursive: make the error-message generation an extern function | Matthieu Moy | 2009-11-29 | 1 | -13/+18 |
| * | | Merge branch 'mm/maint-hint-failed-merge' | Junio C Hamano | 2009-11-23 | 1 | -1/+7 |
| |\ \ |
|
| | * | | merge-recursive: point the user to commit when file would be overwritten. | Matthieu Moy | 2009-11-22 | 1 | -1/+7 |
| | |/ |
|
| * | | Check the format of more printf-type functions | Tarmigan Casebolt | 2009-11-15 | 1 | -1/+3 |
| |/ |
|
| * | merge-recursive: give less scary messages when merge did not start | Junio C Hamano | 2009-09-08 | 1 | -4/+21 |
