summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)Author
2018-03-21Merge branch 'rj/warning-uninitialized-fix'Junio C Hamano
2018-03-20-Wuninitialized: remove some 'init-self' workaroundsRamsay Jones
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-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-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
2017-11-01diff: make struct diff_flags members lowercaseBrandon Williams
2017-11-01diff: remove DIFF_OPT_CLR macroBrandon Williams
2017-11-01diff: remove DIFF_OPT_SET macroBrandon Williams
2017-11-01merge-recursive: check GIT_MERGE_VERBOSITY only onceAndrey Okoshkin
2017-10-06treewide: prefer lockfiles on the stackMartin Ågren
2017-09-19Merge branch 'kw/merge-recursive-cleanup'Junio C Hamano
2017-09-08merge-recursive: change current file dir string_lists to hashmapKevin Willford
2017-09-06merge-recursive: remove return value from get_files_dirsKevin Willford
2017-09-06merge-recursive: fix memory leakKevin Willford
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ågren
2017-07-07Merge branch 'sb/merge-recursive-code-cleanup'Junio C Hamano
2017-06-30merge-recursive: use DIFF_XDL_SET macroStefan Beller
2017-06-24Merge branch 'bw/config-h'Junio C Hamano
2017-06-24Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano
2017-06-15config: don't include config.h by defaultBrandon Williams
2017-06-13convert: convert renormalize_buffer to take an indexBrandon Williams
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams
2017-05-08object: convert parse_object* to take struct object_idbrian m. carlson
2017-05-08Convert lookup_tree to struct object_idbrian m. carlson
2017-05-08submodule: convert merge_submodule to use struct object_idbrian m. carlson
2017-05-02Convert struct cache_tree to use struct object_idbrian m. carlson
2017-02-27Merge branch 'mm/merge-rename-delete-message'Junio C Hamano
2017-01-30use SWAP macroRené Scharfe
2017-01-30merge-recursive: make "CONFLICT (rename/delete)" message show both pathsMatt McCutchen