summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)Author
2018-04-11Revert "Merge branch 'en/rename-directory-detection'"Junio C Hamano
2018-04-09Merge branch 'bc/object-id'Junio C Hamano
2018-04-09Merge branch 'en/rename-directory-detection'Junio C Hamano
2018-03-21Merge branch 'rj/warning-uninitialized-fix'Junio C Hamano
2018-03-20-Wuninitialized: remove some 'init-self' workaroundsRamsay Jones
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson
2018-03-14tree-walk: convert tree entry functions to object_idbrian m. carlson
2018-03-14strbuf: convert strbuf_add_unique_abbrev to use struct object_idbrian m. carlson
2018-03-14tree: convert read_tree_recursive to struct object_idbrian m. carlson
2018-03-01write_locked_index(): add flag to avoid writing unchanged indexMartin Ågren
2018-02-28merge-recursive: always roll back lock in `merge_recursive_generic()`Martin Ågren
2018-02-27merge-recursive: ensure we write updates for directory-renamed fileElijah Newren
2018-02-27merge-recursive: avoid spurious rename/rename conflict from dir renamesElijah Newren
2018-02-27merge-recursive: fix remaining directory rename + dirty overwrite casesElijah Newren
2018-02-27merge-recursive: fix overwriting dirty files involved in renamesElijah Newren
2018-02-27merge-recursive: avoid clobbering untracked files with directory renamesElijah Newren
2018-02-27merge-recursive: apply necessary modifications for directory renamesElijah Newren
2018-02-15Merge branch 'jc/merge-symlink-ours-theirs' into maintJunio C Hamano
2018-02-15Merge branch 'po/object-id'Junio C Hamano
2018-02-15Merge branch 'en/merge-recursive-fixes'Junio C Hamano
2018-02-14merge-recursive: when comparing files, don't include treesElijah Newren
2018-02-14merge-recursive: check for file level conflicts then get new nameElijah Newren
2018-02-14merge-recursive: add computation of collisions due to dir rename & mergingElijah Newren
2018-02-14merge-recursive: check for directory level conflictsElijah Newren
2018-02-14merge-recursive: add get_directory_renames()Elijah Newren
2018-02-14merge-recursive: make a helper function for cleanup for handle_renamesElijah Newren
2018-02-14merge-recursive: split out code for determining diff_filepairsElijah Newren
2018-02-14merge-recursive: make !o->detect_rename codepath more obviousElijah Newren
2018-02-14merge-recursive: fix leaks of allocated renames and diff_filepairsElijah Newren
2018-02-14merge-recursive: introduce new functions to handle rename logicElijah Newren
2018-02-14merge-recursive: move the get_renames() functionElijah Newren
2018-01-30sha1_file: convert write_sha1_file to object_idPatryk Obara
2018-01-23Merge branch 'jc/merge-symlink-ours-theirs'Junio C Hamano
2018-01-19merge-recursive: add explanation for src_entry and dst_entryElijah Newren
2018-01-19merge-recursive: fix logic ordering issueElijah Newren
2018-01-09Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano
2018-01-09merge-recursive: do not look at the index during recursive mergeJunio C Hamano
2018-01-03merge: teach -Xours/-Xtheirs to symbolic link mergeJunio C Hamano
2017-12-22Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano
2017-12-22merge-recursive: avoid incorporating uncommitted changes in a mergeElijah Newren
2017-12-19Merge branch 'en/merge-recursive-icase-removal'Junio C Hamano
2017-12-13Merge branch 'bc/hash-algo'Junio C Hamano
2017-11-27Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'Junio C Hamano
2017-11-27Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano
2017-11-27merge-recursive: ignore_case shouldn't reject intentional removalsElijah Newren
2017-11-15merge-recursive: handle addition of submodule on our side of historyElijah Newren
2017-11-15Merge branch 'ao/merge-verbosity-getenv-just-once'Junio C Hamano
2017-11-13Switch empty tree and blob lookups to use hash abstractionbrian m. carlson
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano
2017-11-08diff: --ignore-cr-at-eolJunio C Hamano
generated by cgit v0.10.2-6-g49f6 at 2024-04-16 20:52:56 (GMT)