summaryrefslogtreecommitdiff
path: root/combine-diff.c
AgeCommit message (Expand)Author
2019-01-04Merge branch 'nd/the-index'Junio C Hamano
2018-11-13Merge branch 'jk/xdiff-interface'Junio C Hamano
2018-11-12notes-cache.c: remove the_repository referencesNguyễn Thái Ngọc Duy
2018-11-05combine-diff: use an xdiff hunk callbackJeff King
2018-11-02xdiff-interface: provide a separate consume callback for hunksJeff King
2018-10-19Merge branch 'nd/the-index'Junio C Hamano
2018-09-21userdiff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21diff.c: remove the_index dependency in textconv() functionsNguyễn Thái Ngọc Duy
2018-09-21combine-diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King
2018-05-16object-store: move object access functions to object-store.hStefan Beller
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson
2018-03-14Convert find_unique_abbrev* to struct object_idbrian m. carlson
2018-03-06Merge branch 'bw/c-plus-plus'Junio C Hamano
2018-02-22combine-diff: rename 'new' variablesBrandon Williams
2018-02-13Merge branch 'tb/crlf-conv-flags'Junio C Hamano
2018-01-16convert_to_git(): safe_crlf/checksafe becomes int conv_flagsTorsten Bögershausen
2018-01-04diff: introduce DIFF_PICKAXE_KINDS_MASKStefan Beller
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio 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-01diff: remove DIFF_OPT_TST macroBrandon Williams
2017-10-16refs: convert resolve_gitlink_ref to struct object_idbrian m. carlson
2017-06-24Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano
2017-06-13convert: convert convert_to_git to take an indexBrandon Williams
2017-06-05tree-diff: convert diff_tree_paths to struct object_idBrandon Williams
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams
2017-06-02combine-diff: convert find_paths_* to struct object_idBrandon Williams
2017-06-02combine-diff: convert diff_tree_combined to struct object_idBrandon Williams
2017-06-02diff: convert fill_filespec to struct object_idBrandon Williams
2017-04-20Merge branch 'bc/object-id'Junio C Hamano
2017-03-31Rename sha1_array to oid_arraybrian m. carlson
2017-03-31Make sha1_array_append take a struct object_id *brian m. carlson
2017-03-30combine-diff: replace malloc/snprintf with xstrfmtJeff King
2017-03-28sha1-array: convert internal storage for struct sha1_array to object_idbrian m. carlson
2016-10-26diff_aligned_abbrev: use "struct oid"Jeff King
2016-10-26diff_unique_abbrev: rename to diff_aligned_abbrevJeff King
2016-07-19Merge branch 'bc/cocci'Junio C Hamano
2016-06-28diff: rename struct diff_filespec's sha1_valid memberbrian m. carlson
2016-06-28diff: convert struct diff_filespec to struct object_idbrian m. carlson
2016-06-02pathspec: rename free_pathspec() to clear_pathspec()Junio C Hamano
2016-05-09combine-diff.c: use error_errno()Nguyễn Thái Ngọc Duy
2016-02-22use st_add and st_mult for allocation size computationJeff King
2016-02-22convert trivial cases to FLEX_ARRAY macrosJeff King
2016-02-22use xmallocz to avoid size arithmeticJeff King
2016-02-22convert trivial cases to ALLOC_ARRAYJeff King
2015-11-20Remove get_object_hash.brian m. carlson
2015-11-20Add several uses of get_object_hash.brian m. carlson
2015-09-28Sync with 2.4.10Junio C Hamano