summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | merge-recursive: provide a better label for diff3 common ancestorElijah Newren2019-08-191-1/+15
| * | merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()Elijah Newren2019-08-161-10/+9
| * | merge-recursive: be consistent with assertElijah Newren2019-08-161-1/+1
| |/
* | merge-recursive: symlink's descendants not in wayJonathan Tan2019-09-201-1/+2
|/
* Merge branch 'en/disable-dir-rename-in-recursive-merge'Junio C Hamano2019-08-081-1/+2
|\
| * merge-recursive: avoid directory rename detection in recursive caseElijah Newren2019-08-061-1/+2
* | Use the right 'struct repository' instead of the_repositoryNguyễn Thái Ngọc Duy2019-06-271-15/+20
* | match-trees.c: remove the_repo from shift_tree*()Nguyễn Thái Ngọc Duy2019-06-271-2/+2
* | tree-walk.c: remove the_repo from get_tree_entry()Nguyễn Thái Ngọc Duy2019-06-271-3/+5
|/
* Merge branch 'en/merge-directory-renames-fix'Junio C Hamano2019-06-061-0/+1
|\
| * merge-recursive: restore accidentally dropped setting of pathElijah Newren2019-06-051-0/+1
* | Merge branch 'nd/sha1-name-c-wo-the-repository'Junio C Hamano2019-05-091-1/+6
|\ \
| * | commit.cocci: refactor code, avoid double rewriteNguyễn Thái Ngọc Duy2019-04-161-1/+6
* | | Merge branch 'en/merge-directory-renames'Junio C Hamano2019-05-091-938/+915
|\ \ \ | | |/ | |/|
View Lorry Controller Status