summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2021-03-20tree.h API: simplify read_tree_recursive() signatureLibravatar Ævar Arnfjörð Bjarmason1-3/+3
2020-12-16commit: move reverse_commit_list() from merge-recursiveLibravatar Elijah Newren1-11/+0
2020-11-02hashmap: provide deallocation function namesLibravatar Elijah Newren1-3/+3
2020-08-10Merge branch 'en/eol-attrs-gotchas'Libravatar Junio C Hamano1-0/+3
2020-08-03merge: make merge.renormalize work for all uses of merge machineryLibravatar Elijah Newren1-0/+3
2020-08-02merge-recursive: fix unclear and outright wrong commentsLibravatar Elijah Newren1-2/+3
2020-05-14merge-recursive: fix rename/rename(1to2) for working tree with a binaryLibravatar Elijah Newren1-0/+12
2020-03-16convert: permit passing additional metadata to filter processesLibravatar brian m. carlson1-1/+1
2020-03-09Merge branch 'en/merge-path-collision'Libravatar Junio C Hamano1-105/+47
2020-03-02Merge branch 'en/t3433-rebase-stat-dirty-failure'Libravatar Junio C Hamano1-2/+5
2020-02-27merge-recursive: apply collision handling unification to recursive caseLibravatar Elijah Newren1-105/+47
2020-02-19merge-recursive: fix the refresh logic in update_file_flagsLibravatar Elijah Newren1-2/+5
2020-01-27merge-recursive: use subtraction to flip stageLibravatar Junio C Hamano1-3/+2
2020-01-27merge-recursive: silence -Wxor-used-as-pow warningLibravatar Jeff King1-5/+14
2020-01-06Merge branch 'en/merge-recursive-oid-eq-simplify'Libravatar Junio C Hamano1-22/+11
2020-01-02merge-recursive: remove unnecessary oid_eq functionLibravatar Elijah Newren1-22/+11
2019-11-10Merge branch 'en/merge-recursive-directory-rename-fixes'Libravatar Junio C Hamano1-23/+81
2019-10-23merge-recursive: fix merging a subdirectory into the root directoryLibravatar Elijah Newren1-3/+49
2019-10-23merge-recursive: clean up get_renamed_dir_portion()Libravatar Elijah Newren1-24/+36
2019-10-15Merge branch 'ew/hashmap'Libravatar Junio C Hamano1-40/+51
2019-10-15Merge branch 'en/merge-recursive-cleanup'Libravatar Junio C Hamano1-226/+346
2019-10-08merge-recursive: fix the fix to the diff3 common ancestor labelLibravatar Elijah Newren1-1/+2
2019-10-07hashmap: remove type arg from hashmap_{get,put,remove}_entryLibravatar Eric Wong1-4/+2
2019-10-07OFFSETOF_VAR macro to simplify hashmap iteratorsLibravatar Eric Wong1-5/+0
2019-10-07hashmap: introduce hashmap_free_entriesLibravatar Eric Wong1-3/+4
2019-10-07hashmap: use *_entry APIs for iterationLibravatar Eric Wong1-10/+15
2019-10-07hashmap_cmp_fn takes hashmap_entry paramsLibravatar Eric Wong1-12/+21
2019-10-07hashmap_get{,_from_hash} return "struct hashmap_entry *"Libravatar Eric Wong1-2/+4
2019-10-07hashmap_put takes "struct hashmap_entry *"Libravatar Eric Wong1-2/+2
2019-10-07hashmap_remove takes "const struct hashmap_entry *"Libravatar Eric Wong1-1/+1
2019-10-07hashmap_get takes "const struct hashmap_entry *"Libravatar Eric Wong1-2/+2
2019-10-07hashmap_add takes "struct hashmap_entry *"Libravatar Eric Wong1-2/+2
2019-10-07hashmap_entry_init takes "struct hashmap_entry *"Libravatar Eric Wong1-6/+7
2019-10-02merge-recursive: fix the diff3 common ancestor label for virtual commitsLibravatar Elijah Newren1-1/+6
2019-09-20merge-recursive: symlink's descendants not in wayLibravatar Jonathan Tan1-1/+2
2019-08-19merge-recursive: alphabetize include listLibravatar Elijah Newren1-16/+17
2019-08-19merge-recursive: add sanity checks for relevant merge_optionsLibravatar Elijah Newren1-0/+24
2019-08-19merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*Libravatar Elijah Newren1-7/+7
2019-08-19merge-recursive: split internal fields into a separate structLibravatar Elijah Newren1-87/+98
2019-08-19merge-recursive: avoid losing output and leaking memory holding that outputLibravatar Elijah Newren1-3/+3
2019-08-19merge-recursive: comment and reorder the merge_options fieldsLibravatar Elijah Newren1-5/+11
2019-08-19merge-recursive: consolidate unnecessary fields in merge_optionsLibravatar Elijah Newren1-16/+11
2019-08-19merge-recursive: move some definitions around to clean up the headerLibravatar Elijah Newren1-0/+31
2019-08-19merge-recursive: rename 'mrtree' to 'result_tree', for clarityLibravatar Elijah Newren1-3/+4
2019-08-19merge-recursive: use common name for ancestors/common/base_listLibravatar Elijah Newren1-35/+37
2019-08-19merge-recursive: fix some overly long linesLibravatar Elijah Newren1-6/+13
2019-08-19cache-tree: share code between functions writing an index as a treeLibravatar Elijah Newren1-32/+2
2019-08-19merge-recursive: don't force external callers to do our loggingLibravatar Elijah Newren1-4/+3
2019-08-19merge-recursive: remove useless parameter in merge_trees()Libravatar Elijah Newren1-3/+3
2019-08-19merge-recursive: exit early if index != headLibravatar Elijah Newren1-29/+72
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 01:35:30 +0000