summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)Author
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-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
2019-08-06merge-recursive: avoid directory rename detection in recursive caseElijah Newren
2019-06-27Use the right 'struct repository' instead of the_repositoryNguyễn Thái Ngọc Duy
2019-06-27match-trees.c: remove the_repo from shift_tree*()Nguyễn Thái Ngọc Duy
2019-06-27tree-walk.c: remove the_repo from get_tree_entry()Nguyễn Thái Ngọc Duy
2019-06-06Merge branch 'en/merge-directory-renames-fix'Junio C Hamano
2019-06-05merge-recursive: restore accidentally dropped setting of pathElijah Newren
2019-05-08Merge branch 'nd/sha1-name-c-wo-the-repository'Junio C Hamano
2019-05-08Merge branch 'en/merge-directory-renames'Junio C Hamano
2019-04-16commit.cocci: refactor code, avoid double rewriteNguyễn Thái Ngọc Duy
2019-04-08merge-recursive: switch directory rename detection defaultElijah Newren
2019-04-08merge-recursive: give callers of handle_content_merge() access to contentsElijah Newren
2019-04-08merge-recursive: track information associated with directory renamesElijah Newren
2019-04-08merge-recursive: switch from (oid,mode) pairs to a diff_filespecElijah Newren
2019-04-08merge-recursive: cleanup handle_rename_* function signaturesElijah Newren
2019-04-08merge-recursive: track branch where rename occurred in rename structElijah Newren
2019-04-08merge-recursive: remove ren[12]_other fields from rename_conflict_infoElijah Newren
2019-04-08merge-recursive: shrink rename_conflict_infoElijah Newren
2019-04-08merge-recursive: move some struct declarations togetherElijah Newren
2019-04-08merge-recursive: use 'ci' for rename_conflict_info variable nameElijah Newren
2019-04-08merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf'Elijah Newren
2019-04-08merge-recursive: rename diff_filespec 'one' to 'o'Elijah Newren
2019-04-08merge-recursive: rename merge_options argument from 'o' to 'opt'Elijah Newren
2019-04-08Use 'unsigned short' for mode, like diff_filespec doesElijah Newren
2019-04-01submodule: avoid hard-coded constantsbrian m. carlson
generated by cgit v0.10.2-6-g49f6 at 2024-04-20 01:52:38 (GMT)