summaryrefslogtreecommitdiff
path: root/combine-diff.c
Commit message (Expand)AuthorAgeFilesLines
* commit.h: reduce unnecessary includesElijah Newren2023-04-241-0/+1
* treewide: remove cache.h inclusion due to previous changesElijah Newren2023-04-241-1/+1
* treewide: remove double forward declaration of read_in_fullElijah Newren2023-04-111-0/+1
* object-name.h: move declarations for object-name.c functions from cache.hElijah Newren2023-04-111-0/+1
* treewide: be explicit about dependence on convert.hElijah Newren2023-04-111-0/+1
* Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano2023-04-041-4/+4
|\
| * libs: use "struct repository *" argument, not "the_repository"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
| * cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
| * cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-3/+3
* | environment.h: move declarations for environment.c functions from cache.hElijah Newren2023-03-211-0/+1
* | cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-231-0/+1
|/
* diff: mark unused parameters in callbacksJeff King2022-12-131-1/+1
* Merge branch 'rs/combine-diff-with-incompatible-options'Junio C Hamano2022-07-111-0/+7
|\
| * combine-diff: abort if --output is givenRené Scharfe2022-06-211-0/+3
| * combine-diff: abort if --ignore-matching-lines is givenRené Scharfe2022-06-211-0/+4
* | tree-wide: apply equals-null.cocciJunio C Hamano2022-05-021-2/+2
|/
* 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
|/
View Lorry Controller Status