summaryrefslogtreecommitdiff
path: root/combine-diff.c
AgeCommit message (Expand)Author
2020-10-05Merge branch 'jk/diff-cc-oidfind-fix'Junio C Hamano
2020-09-30combine-diff: handle --find-object in multitree code pathJeff King
2020-09-29diff: get rid of redundant 'dense' argumentSergey Organov
2020-03-30oid_array: rename source file from sha1-arrayJeff King
2019-08-19combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algobrian m. carlson
2019-03-07Merge branch 'en/combined-all-paths'Junio C Hamano
2019-02-08log,diff-tree: add --combined-all-paths optionElijah Newren
2019-02-05Merge branch 'jk/diff-cc-stat-fixes'Junio C Hamano
2019-01-24combine-diff: treat --dirstat like --statJeff King
2019-01-24combine-diff: treat --summary like --statJeff King
2019-01-24combine-diff: treat --shortstat like --statJeff King
2019-01-24combine-diff: factor out stat-format maskJeff King
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