Age | Commit message (Expand) | Author | Files | Lines |
2010-08-11 | unpack_trees: group error messages by type | Matthieu Moy | 1 | -6/+19 |
2010-08-11 | merge-recursive: distinguish "removed" and "overwritten" messages | Matthieu Moy | 1 | -5/+8 |
2010-08-11 | merge-recursive: porcelain messages for checkout | Diane Gasselin | 1 | -9/+22 |
2010-08-11 | Turn unpack_trees_options.msgs into an array + enum | Matthieu Moy | 1 | -18/+11 |
2010-08-06 | merge-recursive --renormalize | Jonathan Nieder | 1 | -1/+1 |
2010-08-06 | ll-merge: let caller decide whether to renormalize | Jonathan Nieder | 1 | -0/+1 |
2010-08-06 | ll-merge: make flag easier to populate | Jonathan Nieder | 1 | -1/+2 |
2010-08-06 | merge-trees: let caller decide whether to renormalize | Jonathan Nieder | 1 | -1/+2 |
2010-08-06 | merge-trees: push choice to renormalize away from low level | Jonathan Nieder | 1 | -4/+5 |
2010-07-23 | merge-recursive: use find_commit_subject() instead of custom code | Christian Couder | 1 | -10/+4 |
2010-07-09 | merge-recursive: use "up-to-date" instead of "uptodate" in error message for ... | Nicolas Sebrecht | 1 | -1/+1 |
2010-07-09 | merge_recursive: Fix renames across paths below D/F conflicts | Elijah Newren | 1 | -2/+13 |
2010-07-09 | merge-recursive: Fix D/F conflicts | Elijah Newren | 1 | -16/+77 |
2010-07-07 | Implement automatic fast-forward merge for submodules | Heiko Voigt | 1 | -3/+6 |
2010-07-05 | string_list: Add STRING_LIST_INIT macro and make use of it. | Thiago Farina | 1 | -1/+2 |
2010-07-02 | Try normalizing files to avoid delete/modify conflicts when merging | Eyvind Bernhardsen | 1 | -2/+49 |
2010-06-27 | string_list: Fix argument order for string_list_lookup | Julian Phillips | 1 | -4/+4 |
2010-06-27 | string_list: Fix argument order for string_list_insert | Julian Phillips | 1 | -8/+8 |
2010-06-22 | Merge branch 'pc/remove-warn' into maint | Junio C Hamano | 1 | -1/+1 |
2010-05-08 | Merge branch 'pc/remove-warn' | Junio C Hamano | 1 | -1/+1 |
2010-03-28 | Remove a redundant errno test in a usage of remove_path | Peter Collingbourne | 1 | -1/+1 |
2010-03-20 | merge-recursive: add a label for ancestor | Jonathan Nieder | 1 | -0/+1 |
2010-03-20 | merge_trees(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 1 | -3/+8 |
2010-03-20 | ll_merge(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 1 | -1/+1 |
2010-02-17 | refactor duplicated fill_mm() in checkout and merge-recursive | Michael Lukashov | 1 | -20/+3 |
2010-01-21 | Merge branch 'maint' | Junio C Hamano | 1 | -4/+4 |
2010-01-21 | merge-recursive: do not return NULL only to cause segfault | Junio C Hamano | 1 | -4/+4 |
2010-01-20 | Merge branch 'ap/merge-backend-opts' | Junio C Hamano | 1 | -10/+29 |
2010-01-17 | Make "subtree" part more orthogonal to the rest of merge-recursive. | Junio C Hamano | 1 | -9/+11 |
2010-01-17 | git merge -X<option> | Avery Pennarun | 1 | -2/+19 |
2009-11-30 | Merge branch 'mm/maint-merge-ff-error-message-fix' | Junio C Hamano | 1 | -18/+23 |
2009-11-29 | merge-recursive: make the error-message generation an extern function | Matthieu Moy | 1 | -13/+18 |
2009-11-23 | Merge branch 'mm/maint-hint-failed-merge' | Junio C Hamano | 1 | -1/+7 |
2009-11-22 | merge-recursive: point the user to commit when file would be overwritten. | Matthieu Moy | 1 | -1/+7 |
2009-11-15 | Check the format of more printf-type functions | Tarmigan Casebolt | 1 | -1/+3 |
2009-09-08 | merge-recursive: give less scary messages when merge did not start | Junio C Hamano | 1 | -4/+21 |
2009-08-10 | Merge branch 'jc/maint-merge-recursive-fix' | Junio C Hamano | 1 | -3/+25 |
2009-07-30 | merge-recursive: don't segfault while handling rename clashes | Junio C Hamano | 1 | -3/+25 |
2009-07-06 | Merge branch 'tr/die_errno' | Junio C Hamano | 1 | -3/+3 |
2009-07-01 | Remove filename from conflict markers | Martin Renold | 1 | -2/+7 |
2009-06-27 | Convert existing die(..., strerror(errno)) to die_errno() | Thomas Rast | 1 | -3/+3 |
2009-06-20 | Fix various sparse warnings in the git source code | Linus Torvalds | 1 | -1/+1 |
2009-05-23 | Merge branch 'do/maint-merge-recursive-fix' | Junio C Hamano | 1 | -5/+6 |
2009-05-09 | merge-recursive: never leave index unmerged while recursing | Dave Olszewski | 1 | -5/+6 |
2009-04-29 | merge-recursive: do not die on a conflicting submodule | Junio C Hamano | 1 | -2/+6 |
2009-04-07 | Merge branch 'cb/maint-merge-recursive-submodule-fix' | Junio C Hamano | 1 | -12/+4 |
2009-04-05 | simplify output of conflicting merge | Clemens Buchacher | 1 | -13/+4 |
2009-04-05 | update cache for conflicting submodule entries | Clemens Buchacher | 1 | -2/+3 |
2009-03-15 | Fix various dead stores found by the clang static analyzer | Benjamin Kramer | 1 | -8/+3 |
2009-02-07 | tree.c: allow read_tree_recursive() to traverse gitlink entries | Lars Hjemli | 1 | -1/+1 |