Age | Commit message (Expand) | Author | Files | Lines |
2020-08-10 | Merge branch 'en/eol-attrs-gotchas' | Junio C Hamano | 1 | -0/+3 |
2020-08-03 | merge: make merge.renormalize work for all uses of merge machinery | Elijah Newren | 1 | -0/+3 |
2020-08-02 | merge-recursive: fix unclear and outright wrong comments | Elijah Newren | 1 | -2/+3 |
2020-05-14 | merge-recursive: fix rename/rename(1to2) for working tree with a binary | Elijah Newren | 1 | -0/+12 |
2020-03-16 | convert: permit passing additional metadata to filter processes | brian m. carlson | 1 | -1/+1 |
2020-03-09 | Merge branch 'en/merge-path-collision' | Junio C Hamano | 1 | -105/+47 |
2020-03-02 | Merge branch 'en/t3433-rebase-stat-dirty-failure' | Junio C Hamano | 1 | -2/+5 |
2020-02-27 | merge-recursive: apply collision handling unification to recursive case | Elijah Newren | 1 | -105/+47 |
2020-02-19 | merge-recursive: fix the refresh logic in update_file_flags | Elijah Newren | 1 | -2/+5 |
2020-01-27 | merge-recursive: use subtraction to flip stage | Junio C Hamano | 1 | -3/+2 |
2020-01-27 | merge-recursive: silence -Wxor-used-as-pow warning | Jeff King | 1 | -5/+14 |
2020-01-06 | Merge branch 'en/merge-recursive-oid-eq-simplify' | Junio C Hamano | 1 | -22/+11 |
2020-01-02 | merge-recursive: remove unnecessary oid_eq function | Elijah Newren | 1 | -22/+11 |
2019-11-10 | Merge branch 'en/merge-recursive-directory-rename-fixes' | Junio C Hamano | 1 | -23/+81 |
2019-10-23 | merge-recursive: fix merging a subdirectory into the root directory | Elijah Newren | 1 | -3/+49 |
2019-10-23 | merge-recursive: clean up get_renamed_dir_portion() | Elijah Newren | 1 | -24/+36 |
2019-10-15 | Merge branch 'ew/hashmap' | Junio C Hamano | 1 | -40/+51 |
2019-10-15 | Merge branch 'en/merge-recursive-cleanup' | Junio C Hamano | 1 | -226/+346 |
2019-10-08 | merge-recursive: fix the fix to the diff3 common ancestor label | Elijah Newren | 1 | -1/+2 |
2019-10-07 | hashmap: remove type arg from hashmap_{get,put,remove}_entry | Eric Wong | 1 | -4/+2 |
2019-10-07 | OFFSETOF_VAR macro to simplify hashmap iterators | Eric Wong | 1 | -5/+0 |
2019-10-07 | hashmap: introduce hashmap_free_entries | Eric Wong | 1 | -3/+4 |
2019-10-07 | hashmap: use *_entry APIs for iteration | Eric Wong | 1 | -10/+15 |
2019-10-07 | hashmap_cmp_fn takes hashmap_entry params | Eric Wong | 1 | -12/+21 |
2019-10-07 | hashmap_get{,_from_hash} return "struct hashmap_entry *" | Eric Wong | 1 | -2/+4 |
2019-10-07 | hashmap_put takes "struct hashmap_entry *" | Eric Wong | 1 | -2/+2 |
2019-10-07 | hashmap_remove takes "const struct hashmap_entry *" | Eric Wong | 1 | -1/+1 |
2019-10-07 | hashmap_get takes "const struct hashmap_entry *" | Eric Wong | 1 | -2/+2 |
2019-10-07 | hashmap_add takes "struct hashmap_entry *" | Eric Wong | 1 | -2/+2 |
2019-10-07 | hashmap_entry_init takes "struct hashmap_entry *" | Eric Wong | 1 | -6/+7 |
2019-10-02 | merge-recursive: fix the diff3 common ancestor label for virtual commits | Elijah Newren | 1 | -1/+6 |
2019-09-20 | merge-recursive: symlink's descendants not in way | Jonathan Tan | 1 | -1/+2 |
2019-08-19 | merge-recursive: alphabetize include list | Elijah Newren | 1 | -16/+17 |
2019-08-19 | merge-recursive: add sanity checks for relevant merge_options | Elijah Newren | 1 | -0/+24 |
2019-08-19 | merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_* | Elijah Newren | 1 | -7/+7 |
2019-08-19 | merge-recursive: split internal fields into a separate struct | Elijah Newren | 1 | -87/+98 |
2019-08-19 | merge-recursive: avoid losing output and leaking memory holding that output | Elijah Newren | 1 | -3/+3 |
2019-08-19 | merge-recursive: comment and reorder the merge_options fields | Elijah Newren | 1 | -5/+11 |
2019-08-19 | merge-recursive: consolidate unnecessary fields in merge_options | Elijah Newren | 1 | -16/+11 |
2019-08-19 | merge-recursive: move some definitions around to clean up the header | Elijah Newren | 1 | -0/+31 |
2019-08-19 | merge-recursive: rename 'mrtree' to 'result_tree', for clarity | Elijah Newren | 1 | -3/+4 |
2019-08-19 | merge-recursive: use common name for ancestors/common/base_list | Elijah Newren | 1 | -35/+37 |
2019-08-19 | merge-recursive: fix some overly long lines | Elijah Newren | 1 | -6/+13 |
2019-08-19 | cache-tree: share code between functions writing an index as a tree | Elijah Newren | 1 | -32/+2 |
2019-08-19 | merge-recursive: don't force external callers to do our logging | Elijah Newren | 1 | -4/+3 |
2019-08-19 | merge-recursive: remove useless parameter in merge_trees() | Elijah Newren | 1 | -3/+3 |
2019-08-19 | merge-recursive: exit early if index != head | Elijah Newren | 1 | -29/+72 |
2019-08-19 | merge-recursive: remove another implicit dependency on the_repository | Elijah Newren | 1 | -2/+5 |
2019-08-19 | merge-recursive: future-proof update_file_flags() against memory leaks | Elijah Newren | 1 | -3/+5 |
2019-08-19 | merge-recursive: introduce an enum for detect_directory_renames values | Derrick Stolee | 1 | -9/+15 |