path: root/merge-recursive.c
AgeCommit message (Expand)Author
2020-03-16convert: permit passing additional metadata to filter processesbrian m. carlson
2020-03-09Merge branch 'en/merge-path-collision'Junio C Hamano
2020-03-02Merge branch 'en/t3433-rebase-stat-dirty-failure'Junio C Hamano
2020-02-27merge-recursive: apply collision handling unification to recursive caseElijah Newren
2020-02-19merge-recursive: fix the refresh logic in update_file_flagsElijah Newren
2020-01-27merge-recursive: use subtraction to flip stageJunio C Hamano
2020-01-27merge-recursive: silence -Wxor-used-as-pow warningJeff King
2020-01-06Merge branch 'en/merge-recursive-oid-eq-simplify'Junio C Hamano
2020-01-02merge-recursive: remove unnecessary oid_eq functionElijah Newren
2019-11-10Merge branch 'en/merge-recursive-directory-rename-fixes'Junio C Hamano
2019-10-23merge-recursive: fix merging a subdirectory into the root directoryElijah Newren
2019-10-23merge-recursive: clean up get_renamed_dir_portion()Elijah Newren
2019-10-15Merge branch 'ew/hashmap'Junio C Hamano
2019-10-15Merge branch 'en/merge-recursive-cleanup'Junio C Hamano
2019-10-08merge-recursive: fix the fix to the diff3 common ancestor labelElijah Newren
2019-10-07hashmap: remove type arg from hashmap_{get,put,remove}_entryEric Wong
2019-10-07OFFSETOF_VAR macro to simplify hashmap iteratorsEric Wong
2019-10-07hashmap: introduce hashmap_free_entriesEric Wong
2019-10-07hashmap: use *_entry APIs for iterationEric Wong
2019-10-07hashmap_cmp_fn takes hashmap_entry paramsEric Wong
2019-10-07hashmap_get{,_from_hash} return "struct hashmap_entry *"Eric Wong
2019-10-07hashmap_put takes "struct hashmap_entry *"Eric Wong
2019-10-07hashmap_remove takes "const struct hashmap_entry *"Eric Wong
2019-10-07hashmap_get takes "const struct hashmap_entry *"Eric Wong
2019-10-07hashmap_add takes "struct hashmap_entry *"Eric Wong
2019-10-07hashmap_entry_init takes "struct hashmap_entry *"Eric Wong
2019-10-02merge-recursive: fix the diff3 common ancestor label for virtual commitsElijah Newren
2019-09-20merge-recursive: symlink's descendants not in wayJonathan Tan
2019-08-19merge-recursive: alphabetize include listElijah Newren
2019-08-19merge-recursive: add sanity checks for relevant merge_optionsElijah Newren
2019-08-19merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*Elijah Newren
2019-08-19merge-recursive: split internal fields into a separate structElijah Newren
2019-08-19merge-recursive: avoid losing output and leaking memory holding that outputElijah Newren
2019-08-19merge-recursive: comment and reorder the merge_options fieldsElijah Newren
2019-08-19merge-recursive: consolidate unnecessary fields in merge_optionsElijah Newren
2019-08-19merge-recursive: move some definitions around to clean up the headerElijah Newren
2019-08-19merge-recursive: rename 'mrtree' to 'result_tree', for clarityElijah Newren
2019-08-19merge-recursive: use common name for ancestors/common/base_listElijah Newren
2019-08-19merge-recursive: fix some overly long linesElijah Newren
2019-08-19cache-tree: share code between functions writing an index as a treeElijah Newren
2019-08-19merge-recursive: don't force external callers to do our loggingElijah Newren
2019-08-19merge-recursive: remove useless parameter in merge_trees()Elijah Newren
2019-08-19merge-recursive: exit early if index != headElijah Newren
2019-08-19merge-recursive: remove another implicit dependency on the_repositoryElijah Newren
2019-08-19merge-recursive: future-proof update_file_flags() against memory leaksElijah Newren
2019-08-19merge-recursive: introduce an enum for detect_directory_renames valuesDerrick Stolee
2019-08-19merge-recursive: provide a better label for diff3 common ancestorElijah Newren
2019-08-16merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()Elijah Newren
2019-08-16merge-recursive: be consistent with assertElijah Newren
2019-08-08Merge branch 'en/disable-dir-rename-in-recursive-merge'Junio C Hamano