| Commit message (Expand) | Author | Age |
* | merge-recursive: option to disable renames | Felipe Gonçalves Assis | 2016-02-17 |
* | Move try_merge_command and checkout_fast_forward to libgit.a | Nguyễn Thái Ngọc Duy | 2012-10-29 |
* | merge-recursive: Save D/F conflict filenames instead of unlinking them | Elijah Newren | 2011-08-14 |
* | Merge branch 'jk/merge-rename-ux' | Junio C Hamano | 2011-03-19 |
|\ |
|
| * | merge: enable progress reporting for rename detection | Jeff King | 2011-02-21 |
| * | merge: improve inexact rename limit warning | Jeff King | 2011-02-21 |
* | | cherry-pick/revert: add support for -X/--strategy-option | Jonathan Nieder | 2010-12-28 |
|/ |
|
* | Merge branch 'kb/merge-recursive-rename-threshold' | Junio C Hamano | 2010-10-26 |
|\ |
|
| * | merge-recursive: option to specify rename threshold | Kevin Ballard | 2010-09-29 |
* | | Merge branch 'jf/merge-ignore-ws' | Junio C Hamano | 2010-10-26 |
|\ \
| |/ |
|
| * | merge-recursive --patience | Justin Frankel | 2010-08-26 |
| * | merge-recursive: expose merge options for builtin merge | Jonathan Nieder | 2010-08-26 |
* | | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 2010-09-03 |
|\ \ |
|
| * | | Move set_porcelain_error_msgs to unpack-trees.c and rename it | Matthieu Moy | 2010-09-03 |
* | | | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 2010-09-03 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | merge-trees: let caller decide whether to renormalize | Jonathan Nieder | 2010-08-06 |
* | | merge-recursive: porcelain messages for checkout | Diane Gasselin | 2010-08-11 |
* | | Turn unpack_trees_options.msgs into an array + enum | Matthieu Moy | 2010-08-11 |
|/ |
|
* | Merge branch 'gv/portable' | Junio C Hamano | 2010-06-21 |
|\ |
|
| * | enums: omit trailing comma for portability | Gary V. Vaughan | 2010-05-31 |
* | | merge: make function try_merge_command non static | Christian Couder | 2010-04-01 |
|/ |
|
* | merge_trees(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2010-03-20 |
* | Merge branch 'ap/merge-backend-opts' | Junio C Hamano | 2010-01-20 |
|\ |
|
| * | Make "subtree" part more orthogonal to the rest of merge-recursive. | Junio C Hamano | 2010-01-17 |
| * | git merge -X<option> | Avery Pennarun | 2010-01-17 |
* | | merge-recursive: make the error-message generation an extern function | Matthieu Moy | 2009-11-29 |
|/ |
|
* | merge-recursive: move current_{file,directory}_set to struct merge_options | Miklos Vajna | 2008-09-04 |
* | merge-recursive: move the global obuf to struct merge_options | Miklos Vajna | 2008-09-04 |
* | merge-recursive: move call_depth to struct merge_options | Miklos Vajna | 2008-09-03 |
* | merge-recursive: introduce merge_options | Miklos Vajna | 2008-08-30 |
* | merge-recursive.c: Add more generic merge_recursive_generic() | Stephan Beyer | 2008-08-30 |
* | Split out merge_recursive() to merge-recursive.c | Miklos Vajna | 2008-08-30 |
* | Build-in merge-recursive | Daniel Barkalow | 2008-02-09 |