summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
Commit message (Expand)AuthorAgeFilesLines
* merge-tree.c: allow specifying the merge-base when --stdin is passedKyle Zhao2022-11-121-2/+19
* merge-tree.c: add --merge-base=<commit> optionKyle Zhao2022-11-121-11/+35
* merge-tree: support multiple batched merges with --stdinElijah Newren2022-10-221-3/+39
* merge-tree: add a --allow-unrelated-histories flagElijah Newren2022-06-221-1/+6
* merge-tree: allow `ls-files -u` style info to be NUL terminatedElijah Newren2022-06-221-1/+3
* merge-ort: optionally produce machine-readable outputElijah Newren2022-06-221-1/+2
* merge-tree: provide easy access to `ls-files -u` style infoElijah Newren2022-06-221-1/+10
* merge-tree: provide a list of which files have conflictsElijah Newren2022-06-221-3/+23
* merge-tree: support including merge messages in outputElijah Newren2022-06-221-2/+19
* merge-tree: implement real mergesElijah Newren2022-06-221-1/+40
* merge-tree: add option parsing and initial shell for real merge functionElijah Newren2022-06-221-9/+75
* merge-tree: move logic for existing merge into new functionElijah Newren2022-06-221-4/+8
* merge-tree: rename merge_trees() to trivial_merge_trees()Elijah Newren2022-06-221-4/+4
* xdiff users: use designated initializers for out_lineÆvar Arnfjörð Bjarmason2021-05-111-4/+1
* merge-base, xdiff: zero out xpparam_t structuresMichał Kępień2020-10-201-0/+1
* Merge branch 'jk/tree-walk-overflow'Junio C Hamano2019-08-221-2/+3
|\
| * tree-walk: add a strbuf wrapper for make_traverse_path()Jeff King2019-08-011-2/+3
| * tree-walk: accept a raw length for traverse_path_len()Jeff King2019-08-011-1/+1
| * tree-walk: drop oid from traverse_infoJeff King2019-07-311-1/+1
| * setup_traverse_info(): stop copying oidJeff King2019-07-311-1/+1
* | tree-walk.c: remove the_repo from fill_tree_descriptor()Nguyễn Thái Ngọc Duy2019-06-271-9/+13
|/
* Merge branch 'nd/the-index-final'Junio C Hamano2019-02-061-1/+3
|\
| * cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy2019-01-241-1/+3
* | Merge branch 'bc/tree-walk-oid'Junio C Hamano2019-01-291-10/+10
|\ \
| * | tree-walk: store object_id in a separate memberbrian m. carlson2019-01-151-10/+10
| |/
* | tree-walk.c: make tree_entry_interesting() take an indexNguyễn Thái Ngọc Duy2018-11-191-1/+1
|/
* Merge branch 'jk/xdiff-interface'Junio C Hamano2018-11-131-1/+2
|\
| * xdiff: provide a separate emit callback for hunksJeff King2018-11-021-1/+2
* | Merge branch 'nd/the-index'Junio C Hamano2018-10-191-1/+1
|\ \
| * | merge-blobs.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+1
| |/
* | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-1/+1
|/
* blob: add repository argument to lookup_blobStefan Beller2018-06-291-1/+2
* Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano2018-06-291-0/+1
|\
| * object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* | exec_cmd: rename to use dash in file nameStefan Beller2018-04-111-1/+1
|/
* sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-2/+3
* tree-walk: convert fill_tree_descriptor() to object_idrs/object-idRené Scharfe2017-08-141-6/+6
* builtin/merge-tree: convert remaining caller of get_sha1 to object_idbrian m. carlson2017-07-171-3/+3
* Convert lookup_blob to struct object_idbrian m. carlson2017-05-081-1/+1
* Convert remaining callers of lookup_blob to object_idbrian m. carlson2017-05-081-5/+5
* struct name_entry: use struct object_id instead of unsigned char sha1[20]brian m. carlson2016-04-251-9/+9
* use xmallocz to avoid size arithmeticJeff King2016-02-221-1/+1
* Remove get_object_hash.brian m. carlson2015-11-201-2/+2
* Convert struct object to object_idbrian m. carlson2015-11-201-1/+1
* Add several uses of get_object_hash.brian m. carlson2015-11-201-2/+2
* react to errors in xdi_diffJeff King2015-09-281-1/+2
* merge-tree: remove unused df_conflict argumentsrs/merge-tree-simplifyRené Scharfe2014-09-021-12/+6
* merge-tree: handle directory/empty conflict correctlyJohn Keeping2013-05-061-1/+5
* merge-tree: fix typo in "both changed identically"John Keeping2013-04-281-1/+1
* merge-tree: don't print entries that match "local"John Keeping2013-04-081-13/+13
View Lorry Controller Status