summaryrefslogtreecommitdiffstats
path: root/merge-recursive.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2020-03-09Merge branch 'en/merge-path-collision'Junio C Hamano1-105/+47
2020-03-02Merge branch 'en/t3433-rebase-stat-dirty-failure'Junio C Hamano1-2/+5
2020-02-27merge-recursive: apply collision handling unification to recursive caseElijah Newren1-105/+47
2020-02-19merge-recursive: fix the refresh logic in update_file_flagsElijah Newren1-2/+5
2020-01-27merge-recursive: use subtraction to flip stageJunio C Hamano1-3/+2
2020-01-27merge-recursive: silence -Wxor-used-as-pow warningJeff King1-5/+14
2020-01-06Merge branch 'en/merge-recursive-oid-eq-simplify'Junio C Hamano1-22/+11
2020-01-02merge-recursive: remove unnecessary oid_eq functionElijah Newren1-22/+11
2019-11-10Merge branch 'en/merge-recursive-directory-rename-fixes'Junio C Hamano1-23/+81
2019-10-23merge-recursive: fix merging a subdirectory into the root directoryElijah Newren1-3/+49
2019-10-23merge-recursive: clean up get_renamed_dir_portion()Elijah Newren1-24/+36
2019-10-15Merge branch 'ew/hashmap'Junio C Hamano1-40/+51
2019-10-15Merge branch 'en/merge-recursive-cleanup'Junio C Hamano1-226/+346
2019-10-08merge-recursive: fix the fix to the diff3 common ancestor labelElijah Newren1-1/+2
2019-10-07hashmap: remove type arg from hashmap_{get,put,remove}_entryEric Wong1-4/+2
2019-10-07OFFSETOF_VAR macro to simplify hashmap iteratorsEric Wong1-5/+0
2019-10-07hashmap: introduce hashmap_free_entriesEric Wong1-3/+4
2019-10-07hashmap: use *_entry APIs for iterationEric Wong1-10/+15
2019-10-07hashmap_cmp_fn takes hashmap_entry paramsEric Wong1-12/+21
2019-10-07hashmap_get{,_from_hash} return "struct hashmap_entry *"Eric Wong1-2/+4
2019-10-07hashmap_put takes "struct hashmap_entry *"Eric Wong1-2/+2
2019-10-07hashmap_remove takes "const struct hashmap_entry *"Eric Wong1-1/+1
2019-10-07hashmap_get takes "const struct hashmap_entry *"Eric Wong1-2/+2
2019-10-07hashmap_add takes "struct hashmap_entry *"Eric Wong1-2/+2
2019-10-07hashmap_entry_init takes "struct hashmap_entry *"Eric Wong1-6/+7
2019-10-02merge-recursive: fix the diff3 common ancestor label for virtual commitsElijah Newren1-1/+6
2019-09-20merge-recursive: symlink's descendants not in wayJonathan Tan1-1/+2
2019-08-19merge-recursive: alphabetize include listElijah Newren1-16/+17
2019-08-19merge-recursive: add sanity checks for relevant merge_optionsElijah Newren1-0/+24
2019-08-19merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*Elijah Newren1-7/+7
2019-08-19merge-recursive: split internal fields into a separate structElijah Newren1-87/+98
2019-08-19merge-recursive: avoid losing output and leaking memory holding that outputElijah Newren1-3/+3
2019-08-19merge-recursive: comment and reorder the merge_options fieldsElijah Newren1-5/+11
2019-08-19merge-recursive: consolidate unnecessary fields in merge_optionsElijah Newren1-16/+11
2019-08-19merge-recursive: move some definitions around to clean up the headerElijah Newren1-0/+31
2019-08-19merge-recursive: rename 'mrtree' to 'result_tree', for clarityElijah Newren1-3/+4
2019-08-19merge-recursive: use common name for ancestors/common/base_listElijah Newren1-35/+37
2019-08-19merge-recursive: fix some overly long linesElijah Newren1-6/+13
2019-08-19cache-tree: share code between functions writing an index as a treeElijah Newren1-32/+2
2019-08-19merge-recursive: don't force external callers to do our loggingElijah Newren1-4/+3
2019-08-19merge-recursive: remove useless parameter in merge_trees()Elijah Newren1-3/+3
2019-08-19merge-recursive: exit early if index != headElijah Newren1-29/+72
2019-08-19merge-recursive: remove another implicit dependency on the_repositoryElijah Newren1-2/+5
2019-08-19merge-recursive: future-proof update_file_flags() against memory leaksElijah Newren1-3/+5
2019-08-19merge-recursive: introduce an enum for detect_directory_renames valuesDerrick Stolee1-9/+15
2019-08-19merge-recursive: provide a better label for diff3 common ancestorElijah Newren1-1/+15
2019-08-16merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()Elijah Newren1-10/+9
2019-08-16merge-recursive: be consistent with assertElijah Newren1-1/+1
2019-08-08Merge branch 'en/disable-dir-rename-in-recursive-merge'Junio C Hamano1-1/+2
2019-08-06merge-recursive: avoid directory rename detection in recursive caseElijah Newren1-1/+2
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-05 07:53:07 +0000