@matheusbsbs / matheus-bagliano
Code Commits 82,037 Issues Pulls Sessions CI/CD
test
bisect jch maint master next seen test todo

merge-recursive: add sanity checks for relevant merge_options

Elijah Newren committed about 7 years ago

45ef16f77a

merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*

Elijah Newren committed about 7 years ago

f3081dae01

merge-recursive: split internal fields into a separate struct

Elijah Newren committed about 7 years ago

5bf7e5779e

merge-recursive: avoid losing output and leaking memory holding that output

Elijah Newren committed about 7 years ago

e95e481f9e

merge-recursive: comment and reorder the merge_options fields

Elijah Newren committed about 7 years ago

a779fb829b

merge-recursive: consolidate unnecessary fields in merge_options

Elijah Newren committed about 7 years ago

8599ab4574

merge-recursive: move some definitions around to clean up the header

Elijah Newren committed about 7 years ago

7c0a6c8e47

merge-recursive: rename merge_options argument to opt in header

Elijah Newren committed about 7 years ago

c749ab1da8

merge-recursive: rename 'mrtree' to 'result_tree', for clarity

Elijah Newren committed about 7 years ago

bab56877e0

merge-recursive: use common name for ancestors/common/base_list

Elijah Newren committed about 7 years ago

ff1bfa2cd5

merge-recursive: fix some overly long lines

Elijah Newren committed about 7 years ago

4d7101e25c

cache-tree: share code between functions writing an index as a tree

Elijah Newren committed about 7 years ago

724dd767b2

merge-recursive: don't force external callers to do our logging

Elijah Newren committed about 7 years ago

345480d1ed

merge-recursive: remove useless parameter in merge_trees()

Elijah Newren committed about 7 years ago

b4db8a2b76

merge-recursive: exit early if index != head

Elijah Newren committed about 7 years ago

98a1d3d888

Ensure index matches head before invoking merge machinery, round N

Elijah Newren committed about 7 years ago

9822175d2b

merge-recursive: remove another implicit dependency on the_repository

Elijah Newren committed about 7 years ago

10f751c06b

merge-recursive: future-proof update_file_flags() against memory leaks

Elijah Newren committed about 7 years ago

f836bf3937

merge-recursive: introduce an enum for detect_directory_renames values

Derrick Stolee committed about 7 years ago

8e01251694

merge-recursive: provide a better label for diff3 common ancestor

Elijah Newren committed about 7 years ago

743474cbfa
← Newer Page 1269 of 4102 Older →