| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'en/directory-renames-nothanks' | Junio C Hamano | 2018-09-04 | 1 | -0/+1 |
| |\ |
|
| | * | merge-recursive: add ability to turn off directory rename detection | Elijah Newren | 2018-08-30 | 1 | -0/+1 |
| * | | Add missing includes and forward declarations | Elijah Newren | 2018-08-15 | 1 | -1/+3 |
| |/ |
|
| * | merge: add merge.renames config setting | Ben Peart | 2018-05-08 | 1 | -1/+8 |
| * | merge-recursive: fix was_tracked() to quit lying with some renamed paths | Elijah Newren | 2018-05-08 | 1 | -0/+1 |
| * | merge-recursive: fix overwriting dirty files involved in renames | Elijah Newren | 2018-05-08 | 1 | -0/+2 |
| * | merge-recursive: add computation of collisions due to dir rename & merging | Elijah Newren | 2018-05-08 | 1 | -0/+7 |
| * | merge-recursive: add get_directory_renames() | Elijah Newren | 2018-05-08 | 1 | -0/+18 |
| * | Revert "Merge branch 'en/rename-directory-detection'" | Junio C Hamano | 2018-04-11 | 1 | -27/+0 |
| * | merge-recursive: fix overwriting dirty files involved in renames | Elijah Newren | 2018-02-27 | 1 | -0/+2 |
| * | merge-recursive: add computation of collisions due to dir rename & merging | Elijah Newren | 2018-02-14 | 1 | -0/+7 |
| * | merge-recursive: add get_directory_renames() | Elijah Newren | 2018-02-14 | 1 | -0/+18 |
| * | merge-recursive: change current file dir string_lists to hashmapkw/merge-recursive-cleanup | Kevin Willford | 2017-09-08 | 1 | -2/+1 |
| * | merge-recursive: offer an option to retain the output in 'obuf' | Johannes Schindelin | 2016-08-01 | 1 | -1/+1 |
| * | merge-recursive: convert merge_recursive_generic() to object_id | brian m. carlson | 2016-06-28 | 1 | -3/+3 |
| * | merge-recursive: option to disable renames | Felipe Gonçalves Assis | 2016-02-17 | 1 | -0/+1 |
| * | Move try_merge_command and checkout_fast_forward to libgit.a | Nguyễn Thái Ngọc Duy | 2012-10-29 | 1 | -5/+0 |
| * | merge-recursive: Save D/F conflict filenames instead of unlinking them | Elijah Newren | 2011-08-14 | 1 | -0/+1 |
| * | Merge branch 'jk/merge-rename-ux' | Junio C Hamano | 2011-03-19 | 1 | -0/+2 |
| |\ |
|
| | * | merge: enable progress reporting for rename detection | Jeff King | 2011-02-21 | 1 | -0/+1 |
| | * | merge: improve inexact rename limit warning | Jeff King | 2011-02-21 | 1 | -0/+1 |
| * | | cherry-pick/revert: add support for -X/--strategy-option | Jonathan Nieder | 2010-12-28 | 1 | -1/+3 |
| |/ |
|
| * | Merge branch 'kb/merge-recursive-rename-threshold' | Junio C Hamano | 2010-10-26 | 1 | -0/+1 |
| |\ |
|
| | * | merge-recursive: option to specify rename threshold | Kevin Ballard | 2010-09-29 | 1 | -0/+1 |
| * | | Merge branch 'jf/merge-ignore-ws' | Junio C Hamano | 2010-10-26 | 1 | -0/+3 |
| |\ \
| |/ |
|
| | * | merge-recursive --patience | Justin Frankel | 2010-08-26 | 1 | -0/+1 |
| | * | merge-recursive: expose merge options for builtin merge | Jonathan Nieder | 2010-08-26 | 1 | -0/+2 |
| * | | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 2010-09-03 | 1 | -6/+0 |
| |\ \ |
|
| | * | | Move set_porcelain_error_msgs to unpack-trees.c and rename it | Matthieu Moy | 2010-09-03 | 1 | -6/+0 |
| * | | | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 2010-09-03 | 1 | -0/+1 |
| |\ \ \
| |/ /
|/| /
| |/ |
|
| | * | merge-trees: let caller decide whether to renormalize | Jonathan Nieder | 2010-08-06 | 1 | -0/+1 |
| * | | merge-recursive: porcelain messages for checkout | Diane Gasselin | 2010-08-11 | 1 | -2/+5 |
| * | | Turn unpack_trees_options.msgs into an array + enum | Matthieu Moy | 2010-08-11 | 1 | -2/+2 |
| |/ |
|
| * | Merge branch 'gv/portable' | Junio C Hamano | 2010-06-21 | 1 | -1/+1 |
| |\ |
|
| | * | enums: omit trailing comma for portability | Gary V. Vaughan | 2010-05-31 | 1 | -1/+1 |
| * | | merge: make function try_merge_command non static | Christian Couder | 2010-04-01 | 1 | -0/+3 |
| |/ |
|
| * | merge_trees(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2010-03-20 | 1 | -0/+1 |
| * | Merge branch 'ap/merge-backend-opts' | Junio C Hamano | 2010-01-20 | 1 | -1/+6 |
| |\ |
|
| | * | Make "subtree" part more orthogonal to the rest of merge-recursive. | Junio C Hamano | 2010-01-17 | 1 | -1/+2 |
| | * | git merge -X<option> | Avery Pennarun | 2010-01-17 | 1 | -1/+5 |
| * | | merge-recursive: make the error-message generation an extern function | Matthieu Moy | 2009-11-29 | 1 | -0/+3 |
| |/ |
|
| * | merge-recursive: move current_{file,directory}_set to struct merge_options | Miklos Vajna | 2008-09-04 | 1 | -0/+4 |
| * | merge-recursive: move the global obuf to struct merge_options | Miklos Vajna | 2008-09-04 | 1 | -0/+1 |
| * | merge-recursive: move call_depth to struct merge_options | Miklos Vajna | 2008-09-03 | 1 | -0/+1 |
| * | merge-recursive: introduce merge_options | Miklos Vajna | 2008-08-30 | 1 | -13/+29 |
| * | merge-recursive.c: Add more generic merge_recursive_generic() | Stephan Beyer | 2008-08-30 | 1 | -1/+3 |
| * | Split out merge_recursive() to merge-recursive.c | Miklos Vajna | 2008-08-30 | 1 | -1/+5 |
| * | Build-in merge-recursive | Daniel Barkalow | 2008-02-09 | 1 | -0/+20 |
