summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* hashmap: provide deallocation function namesElijah Newren2020-11-021-3/+3
* Merge branch 'en/eol-attrs-gotchas'Junio C Hamano2020-08-101-0/+3
|\
| * merge: make merge.renormalize work for all uses of merge machineryElijah Newren2020-08-031-0/+3
* | merge-recursive: fix unclear and outright wrong commentsElijah Newren2020-08-021-2/+3
|/
* merge-recursive: fix rename/rename(1to2) for working tree with a binaryElijah Newren2020-05-141-0/+12
* convert: permit passing additional metadata to filter processesbrian m. carlson2020-03-161-1/+1
* Merge branch 'en/merge-path-collision'Junio C Hamano2020-03-091-105/+47
|\
| * merge-recursive: apply collision handling unification to recursive caseElijah Newren2020-02-271-105/+47
* | Merge branch 'en/t3433-rebase-stat-dirty-failure'Junio C Hamano2020-03-021-2/+5
|\ \ | |/ |/|
| * merge-recursive: fix the refresh logic in update_file_flagsElijah Newren2020-02-191-2/+5
* | merge-recursive: use subtraction to flip stageJunio C Hamano2020-01-271-3/+2
* | merge-recursive: silence -Wxor-used-as-pow warningJeff King2020-01-271-5/+14
|/
* Merge branch 'en/merge-recursive-oid-eq-simplify'Junio C Hamano2020-01-061-22/+11
|\
| * merge-recursive: remove unnecessary oid_eq functionElijah Newren2020-01-021-22/+11
* | Merge branch 'en/merge-recursive-directory-rename-fixes'Junio C Hamano2019-11-101-23/+81
|\ \ | |/ |/|
| * merge-recursive: fix merging a subdirectory into the root directoryElijah Newren2019-10-231-3/+49
| * merge-recursive: clean up get_renamed_dir_portion()Elijah Newren2019-10-231-24/+36
* | Merge branch 'ew/hashmap'Junio C Hamano2019-10-151-40/+51
|\ \
| * | hashmap: remove type arg from hashmap_{get,put,remove}_entryEric Wong2019-10-071-4/+2
| * | OFFSETOF_VAR macro to simplify hashmap iteratorsEric Wong2019-10-071-5/+0
| * | hashmap: introduce hashmap_free_entriesEric Wong2019-10-071-3/+4
| * | hashmap: use *_entry APIs for iterationEric Wong2019-10-071-10/+15
| * | hashmap_cmp_fn takes hashmap_entry paramsEric Wong2019-10-071-12/+21
| * | hashmap_get{,_from_hash} return "struct hashmap_entry *"Eric Wong2019-10-071-2/+4
| * | hashmap_put takes "struct hashmap_entry *"Eric Wong2019-10-071-2/+2
| * | hashmap_remove takes "const struct hashmap_entry *"Eric Wong2019-10-071-1/+1
| * | hashmap_get takes "const struct hashmap_entry *"Eric Wong2019-10-071-2/+2
| * | hashmap_add takes "struct hashmap_entry *"Eric Wong2019-10-071-2/+2
| * | hashmap_entry_init takes "struct hashmap_entry *"Eric Wong2019-10-071-6/+7
* | | Merge branch 'en/merge-recursive-cleanup'Junio C Hamano2019-10-151-226/+346
|\ \ \ | |_|/ |/| |
| * | merge-recursive: fix the fix to the diff3 common ancestor labelElijah Newren2019-10-081-1/+2
| * | merge-recursive: fix the diff3 common ancestor label for virtual commitsElijah Newren2019-10-021-1/+6
| * | merge-recursive: alphabetize include listElijah Newren2019-08-191-16/+17
| * | merge-recursive: add sanity checks for relevant merge_optionsElijah Newren2019-08-191-0/+24
| * | merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*Elijah Newren2019-08-191-7/+7
| * | merge-recursive: split internal fields into a separate structElijah Newren2019-08-191-87/+98
| * | merge-recursive: avoid losing output and leaking memory holding that outputElijah Newren2019-08-191-3/+3
| * | merge-recursive: comment and reorder the merge_options fieldsElijah Newren2019-08-191-5/+11
| * | merge-recursive: consolidate unnecessary fields in merge_optionsElijah Newren2019-08-191-16/+11
| * | merge-recursive: move some definitions around to clean up the headerElijah Newren2019-08-191-0/+31
| * | merge-recursive: rename 'mrtree' to 'result_tree', for clarityElijah Newren2019-08-191-3/+4
| * | merge-recursive: use common name for ancestors/common/base_listElijah Newren2019-08-191-35/+37
| * | merge-recursive: fix some overly long linesElijah Newren2019-08-191-6/+13
| * | cache-tree: share code between functions writing an index as a treeElijah Newren2019-08-191-32/+2
| * | merge-recursive: don't force external callers to do our loggingElijah Newren2019-08-191-4/+3
| * | merge-recursive: remove useless parameter in merge_trees()Elijah Newren2019-08-191-3/+3
| * | merge-recursive: exit early if index != headElijah Newren2019-08-191-29/+72
| * | merge-recursive: remove another implicit dependency on the_repositoryElijah Newren2019-08-191-2/+5
| * | merge-recursive: future-proof update_file_flags() against memory leaksElijah Newren2019-08-191-3/+5
| * | merge-recursive: introduce an enum for detect_directory_renames valuesDerrick Stolee2019-08-191-9/+15
View Lorry Controller Status