path: root/builtin/merge-tree.c
AgeCommit message (Expand)Author
2022-11-21{builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"Ævar Arnfjörð Bjarmason
2022-10-23merge-tree: support multiple batched merges with --stdinElijah Newren
2022-06-22merge-tree: add a --allow-unrelated-histories flagElijah Newren
2022-06-22merge-tree: allow `ls-files -u` style info to be NUL terminatedElijah Newren
2022-06-22merge-ort: optionally produce machine-readable outputElijah Newren
2022-06-22merge-tree: provide easy access to `ls-files -u` style infoElijah Newren
2022-06-22merge-tree: provide a list of which files have conflictsElijah Newren
2022-06-22merge-tree: support including merge messages in outputElijah Newren
2022-06-22merge-tree: implement real mergesElijah Newren
2022-06-22merge-tree: add option parsing and initial shell for real merge functionElijah Newren
2022-06-22merge-tree: move logic for existing merge into new functionElijah Newren
2022-06-22merge-tree: rename merge_trees() to trivial_merge_trees()Elijah Newren
2021-05-11xdiff users: use designated initializers for out_lineÆvar Arnfjörð Bjarmason
2020-10-20merge-base, xdiff: zero out xpparam_t structuresMichał Kępień
2019-08-22Merge branch 'jk/tree-walk-overflow'Junio C Hamano
2019-08-01tree-walk: add a strbuf wrapper for make_traverse_path()Jeff King
2019-08-01tree-walk: accept a raw length for traverse_path_len()Jeff King
2019-07-31tree-walk: drop oid from traverse_infoJeff King
2019-07-31setup_traverse_info(): stop copying oidJeff King
2019-06-27tree-walk.c: remove the_repo from fill_tree_descriptor()Nguyễn Thái Ngọc Duy
2019-02-07Merge branch 'nd/the-index-final'Junio C Hamano
2019-01-29Merge branch 'bc/tree-walk-oid'Junio C Hamano
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy
2019-01-15tree-walk: store object_id in a separate memberbrian m. carlson
2018-11-19tree-walk.c: make tree_entry_interesting() take an indexNguyễn Thái Ngọc Duy
2018-11-13Merge branch 'jk/xdiff-interface'Junio C Hamano
2018-11-02xdiff: provide a separate emit callback for hunksJeff King
2018-10-19Merge branch 'nd/the-index'Junio C Hamano
2018-09-21merge-blobs.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King
2018-06-29blob: add repository argument to lookup_blobStefan Beller
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano
2018-05-16object-store: move object access functions to object-store.hStefan Beller
2018-04-11exec_cmd: rename to use dash in file nameStefan Beller
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson
2017-08-14tree-walk: convert fill_tree_descriptor() to object_idRené Scharfe
2017-07-17builtin/merge-tree: convert remaining caller of get_sha1 to object_idbrian m. carlson
2017-05-08Convert lookup_blob to struct object_idbrian m. carlson
2017-05-08Convert remaining callers of lookup_blob to object_idbrian m. carlson
2016-04-25struct name_entry: use struct object_id instead of unsigned char sha1[20]brian m. carlson
2016-02-22use xmallocz to avoid size arithmeticJeff King
2015-11-20Remove get_object_hash.brian m. carlson
2015-11-20Convert struct object to object_idbrian m. carlson
2015-11-20Add several uses of get_object_hash.brian m. carlson
2015-09-28react to errors in xdi_diffJeff King
2014-09-02merge-tree: remove unused df_conflict argumentsRené Scharfe
2013-05-07merge-tree: handle directory/empty conflict correctlyJohn Keeping
2013-04-28merge-tree: fix typo in "both changed identically"John Keeping
2013-04-08merge-tree: don't print entries that match "local"John Keeping
2013-03-27merge-tree: fix typo in merge-tree.c::unresolvedJohn Keeping