Age | Commit message (Expand) | Author | Files | Lines |
2022-02-02 | merge-ort: format messages slightly different for use in headers | Elijah Newren | 1 | -0/+2 |
2020-08-02 | merge-recursive: fix unclear and outright wrong comments | Elijah Newren | 1 | -7/+6 |
2019-08-19 | merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_* | Elijah Newren | 1 | -3/+3 |
2019-08-19 | merge-recursive: split internal fields into a separate struct | Elijah Newren | 1 | -10/+7 |
2019-08-19 | merge-recursive: avoid losing output and leaking memory holding that output | Elijah Newren | 1 | -1/+2 |
2019-08-19 | merge-recursive: comment and reorder the merge_options fields | Elijah Newren | 1 | -14/+26 |
2019-08-19 | merge-recursive: consolidate unnecessary fields in merge_options | Elijah Newren | 1 | -4/+2 |
2019-08-19 | merge-recursive: move some definitions around to clean up the header | Elijah Newren | 1 | -45/+42 |
2019-08-19 | merge-recursive: rename merge_options argument to opt in header | Elijah Newren | 1 | -8/+8 |
2019-08-19 | merge-recursive: use common name for ancestors/common/base_list | Elijah Newren | 1 | -7/+7 |
2019-08-19 | cache-tree: share code between functions writing an index as a tree | Elijah Newren | 1 | -1/+0 |
2019-08-19 | merge-recursive: remove useless parameter in merge_trees() | Elijah Newren | 1 | -4/+16 |
2019-08-19 | merge-recursive: introduce an enum for detect_directory_renames values | Derrick Stolee | 1 | -1/+5 |
2019-01-14 | merge-recursive.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 1 | -1/+5 |
2018-09-04 | Merge branch 'en/directory-renames-nothanks' | Junio C Hamano | 1 | -0/+1 |
2018-08-30 | merge-recursive: add ability to turn off directory rename detection | Elijah Newren | 1 | -0/+1 |
2018-08-15 | Add missing includes and forward declarations | Elijah Newren | 1 | -1/+3 |
2018-05-08 | merge: add merge.renames config setting | Ben Peart | 1 | -1/+8 |
2018-05-08 | merge-recursive: fix was_tracked() to quit lying with some renamed paths | Elijah Newren | 1 | -0/+1 |
2018-05-08 | merge-recursive: fix overwriting dirty files involved in renames | Elijah Newren | 1 | -0/+2 |
2018-05-08 | merge-recursive: add computation of collisions due to dir rename & merging | Elijah Newren | 1 | -0/+7 |
2018-05-08 | merge-recursive: add get_directory_renames() | Elijah Newren | 1 | -0/+18 |
2018-04-11 | Revert "Merge branch 'en/rename-directory-detection'" | Junio C Hamano | 1 | -27/+0 |
2018-02-27 | merge-recursive: fix overwriting dirty files involved in renames | Elijah Newren | 1 | -0/+2 |
2018-02-14 | merge-recursive: add computation of collisions due to dir rename & merging | Elijah Newren | 1 | -0/+7 |
2018-02-14 | merge-recursive: add get_directory_renames() | Elijah Newren | 1 | -0/+18 |
2017-09-08 | merge-recursive: change current file dir string_lists to hashmap | Kevin Willford | 1 | -2/+1 |
2016-08-01 | merge-recursive: offer an option to retain the output in 'obuf' | Johannes Schindelin | 1 | -1/+1 |
2016-06-28 | merge-recursive: convert merge_recursive_generic() to object_id | brian m. carlson | 1 | -3/+3 |
2016-02-17 | merge-recursive: option to disable renames | Felipe Gonçalves Assis | 1 | -0/+1 |
2012-10-29 | Move try_merge_command and checkout_fast_forward to libgit.a | Nguyễn Thái Ngọc Duy | 1 | -5/+0 |
2011-08-14 | merge-recursive: Save D/F conflict filenames instead of unlinking them | Elijah Newren | 1 | -0/+1 |
2011-03-19 | Merge branch 'jk/merge-rename-ux' | Junio C Hamano | 1 | -0/+2 |
2011-02-21 | merge: enable progress reporting for rename detection | Jeff King | 1 | -0/+1 |
2011-02-21 | merge: improve inexact rename limit warning | Jeff King | 1 | -0/+1 |
2010-12-28 | cherry-pick/revert: add support for -X/--strategy-option | Jonathan Nieder | 1 | -1/+3 |
2010-10-26 | Merge branch 'kb/merge-recursive-rename-threshold' | Junio C Hamano | 1 | -0/+1 |
2010-10-26 | Merge branch 'jf/merge-ignore-ws' | Junio C Hamano | 1 | -0/+3 |
2010-09-29 | merge-recursive: option to specify rename threshold | Kevin Ballard | 1 | -0/+1 |
2010-09-03 | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 1 | -6/+0 |
2010-09-03 | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 1 | -0/+1 |
2010-09-03 | Move set_porcelain_error_msgs to unpack-trees.c and rename it | Matthieu Moy | 1 | -6/+0 |
2010-08-26 | merge-recursive --patience | Justin Frankel | 1 | -0/+1 |
2010-08-26 | merge-recursive: expose merge options for builtin merge | Jonathan Nieder | 1 | -0/+2 |
2010-08-11 | merge-recursive: porcelain messages for checkout | Diane Gasselin | 1 | -2/+5 |
2010-08-11 | Turn unpack_trees_options.msgs into an array + enum | Matthieu Moy | 1 | -2/+2 |
2010-08-06 | merge-trees: let caller decide whether to renormalize | Jonathan Nieder | 1 | -0/+1 |
2010-06-21 | Merge branch 'gv/portable' | Junio C Hamano | 1 | -1/+1 |
2010-05-31 | enums: omit trailing comma for portability | Gary V. Vaughan | 1 | -1/+1 |
2010-04-01 | merge: make function try_merge_command non static | Christian Couder | 1 | -0/+3 |