aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/merge-tree.c
AgeCommit message (Expand)AuthorFilesLines
2019-02-06Merge branch 'nd/the-index-final'Junio C Hamano1-1/+3
2019-01-29Merge branch 'bc/tree-walk-oid'Junio C Hamano1-10/+10
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy1-1/+3
2019-01-15tree-walk: store object_id in a separate memberbrian m. carlson1-10/+10
2018-11-19tree-walk.c: make tree_entry_interesting() take an indexNguyễn Thái Ngọc Duy1-1/+1
2018-11-13Merge branch 'jk/xdiff-interface'Junio C Hamano1-1/+2
2018-11-02xdiff: provide a separate emit callback for hunksJeff King1-1/+2
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-1/+1
2018-09-21merge-blobs.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King1-1/+1
2018-06-29blob: add repository argument to lookup_blobStefan Beller1-1/+2
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano1-0/+1
2018-05-16object-store: move object access functions to object-store.hStefan Beller1-0/+1
2018-04-11exec_cmd: rename to use dash in file nameStefan Beller1-1/+1
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson1-2/+3
2017-08-14tree-walk: convert fill_tree_descriptor() to object_idRené Scharfe1-6/+6
2017-07-17builtin/merge-tree: convert remaining caller of get_sha1 to object_idbrian m. carlson1-3/+3
2017-05-08Convert lookup_blob to struct object_idbrian m. carlson1-1/+1
2017-05-08Convert remaining callers of lookup_blob to object_idbrian m. carlson1-5/+5
2016-04-25struct name_entry: use struct object_id instead of unsigned char sha1[20]brian m. carlson1-9/+9
2016-02-22use xmallocz to avoid size arithmeticJeff King1-1/+1
2015-11-20Remove get_object_hash.brian m. carlson1-2/+2
2015-11-20Convert struct object to object_idbrian m. carlson1-1/+1
2015-11-20Add several uses of get_object_hash.brian m. carlson1-2/+2
2015-09-28react to errors in xdi_diffJeff King1-1/+2
2014-09-02merge-tree: remove unused df_conflict argumentsRené Scharfe1-12/+6
2013-05-06merge-tree: handle directory/empty conflict correctlyJohn Keeping1-1/+5
2013-04-28merge-tree: fix typo in "both changed identically"John Keeping1-1/+1
2013-04-08merge-tree: don't print entries that match "local"John Keeping1-13/+13
2013-03-27merge-tree: fix typo in merge-tree.c::unresolvedJohn Keeping1-1/+1
2012-12-26merge-tree: fix d/f conflictsJunio C Hamano1-32/+40
2012-12-26merge-tree: add comments to clarify what these functions are doingJunio C Hamano1-4/+22
2012-12-26merge-tree: lose unused "resolve_directories"Junio C Hamano1-3/+0
2012-12-26merge-tree: lose unused "flags" from merge_listJunio C Hamano1-2/+1
2012-12-09Which merge_file() function do you mean?Junio C Hamano1-2/+2
2011-04-11sparse: Fix an "symbol 'merge_file' not decared" warningRamsay Jones1-2/+1
2011-03-22Fix sparse warningsStephen Boyd1-1/+1
2010-07-14merge-tree: fix where two branches share no changesWill Palmer1-1/+2
2010-06-21Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano1-1/+1
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds1-0/+358