summaryrefslogtreecommitdiff
path: root/combine-diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ab/pickaxe-pcre2'Junio C Hamano2021-07-131-2/+3
|\
| * xdiff-interface: prepare for allowing early returnÆvar Arnfjörð Bjarmason2021-05-111-2/+3
* | hash: provide per-algorithm null OIDsbrian m. carlson2021-04-271-1/+1
|/
* use CALLOC_ARRAYRené Scharfe2021-03-131-10/+10
* Merge branch 'jk/diff-cc-oidfind-fix'Junio C Hamano2020-10-051-2/+41
|\
| * combine-diff: handle --find-object in multitree code pathJeff King2020-09-301-2/+41
* | diff: get rid of redundant 'dense' argumentSergey Organov2020-09-291-12/+9
|/
* oid_array: rename source file from sha1-arrayJeff King2020-03-301-1/+1
* combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algobrian m. carlson2019-08-191-1/+1
* Merge branch 'en/combined-all-paths'Junio C Hamano2019-03-071-11/+65
|\
| * log,diff-tree: add --combined-all-paths optionElijah Newren2019-02-071-11/+65
* | Merge branch 'jk/diff-cc-stat-fixes'Junio C Hamano2019-02-051-6/+11
|\ \ | |/ |/|
| * combine-diff: treat --dirstat like --statJeff King2019-01-241-0/+1
| * combine-diff: treat --summary like --statJeff King2019-01-241-0/+1
| * combine-diff: treat --shortstat like --statJeff King2019-01-241-0/+1
| * combine-diff: factor out stat-format maskJeff King2019-01-241-6/+8
* | Merge branch 'nd/the-index'Junio C Hamano2019-01-041-1/+1
|\ \ | |/ |/|
| * notes-cache.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-1/+1
* | Merge branch 'jk/xdiff-interface'Junio C Hamano2018-11-131-31/+36
|\ \ | |/ |/|
| * combine-diff: use an xdiff hunk callbackJeff King2018-11-051-31/+36
| * xdiff-interface: provide a separate consume callback for hunksJeff King2018-11-021-2/+2
* | Merge branch 'nd/the-index'Junio C Hamano2018-10-191-13/+19
|\ \
| * | userdiff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+1
| * | diff.c: remove the_index dependency in textconv() functionsNguyễn Thái Ngọc Duy2018-09-211-11/+16
| * | combine-diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+2
| |/
* | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-2/+2
|/
* object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-1/+1
* Convert find_unique_abbrev* to struct object_idbrian m. carlson2018-03-141-2/+2
* Merge branch 'bw/c-plus-plus'Junio C Hamano2018-03-061-6/+6
|\
| * combine-diff: rename 'new' variablesBrandon Williams2018-02-221-6/+6
* | Merge branch 'tb/crlf-conv-flags'Junio C Hamano2018-02-131-1/+1
|\ \ | |/ |/|
| * convert_to_git(): safe_crlf/checksafe becomes int conv_flagstb/crlf-conv-flagsTorsten Bögershausen2018-01-161-1/+1
* | diff: introduce DIFF_PICKAXE_KINDS_MASKStefan Beller2018-01-041-1/+1
|/
* Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-5/+5
|\
| * diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfieldsBrandon Williams2017-11-011-5/+5
| * diff: remove DIFF_OPT_CLR macroBrandon Williams2017-11-011-1/+1
| * diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-011-1/+1
| * diff: remove DIFF_OPT_TST macroBrandon Williams2017-11-011-3/+3
* | refs: convert resolve_gitlink_ref to struct object_idbrian m. carlson2017-10-161-1/+1
|/
* Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano2017-06-241-1/+1
|\
| * convert: convert convert_to_git to take an indexBrandon Williams2017-06-131-1/+1
* | tree-diff: convert diff_tree_paths to struct object_idBrandon Williams2017-06-051-5/+5
* | diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams2017-06-051-2/+2
* | combine-diff: convert find_paths_* to struct object_idBrandon Williams2017-06-021-6/+6
* | combine-diff: convert diff_tree_combined to struct object_idBrandon Williams2017-06-021-5/+5
* | diff: convert fill_filespec to struct object_idBrandon Williams2017-06-021-2/+2
|/
* Merge branch 'bc/object-id'Junio C Hamano2017-04-191-9/+9
|\
| * Rename sha1_array to oid_arraybrian m. carlson2017-03-311-6/+6
| * Make sha1_array_append take a struct object_id *brian m. carlson2017-03-311-1/+1
View Lorry Controller Status