summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* merge-tree: fix typo in merge-tree.c::unresolvedJohn Keeping2013-03-271-1/+1
* merge-tree: fix d/f conflictsJunio C Hamano2012-12-261-32/+40
* merge-tree: add comments to clarify what these functions are doingJunio C Hamano2012-12-261-4/+22
* merge-tree: lose unused "resolve_directories"Junio C Hamano2012-12-261-3/+0
* merge-tree: lose unused "flags" from merge_listJunio C Hamano2012-12-261-2/+1
* Which merge_file() function do you mean?Junio C Hamano2012-12-091-2/+2
* sparse: Fix an "symbol 'merge_file' not decared" warningRamsay Jones2011-04-111-2/+1
* Fix sparse warningsStephen Boyd2011-03-221-1/+1
* merge-tree: fix where two branches share no changesWill Palmer2010-07-141-1/+2
* Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano2010-06-211-1/+1
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+358
View Lorry Controller Status