summaryrefslogtreecommitdiff
path: root/diff.h
Commit message (Expand)AuthorAgeFilesLines
* diff.h: move declaration for global in diff.c from cache.hElijah Newren2023-05-161-0/+2
* Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-pa...Junio C Hamano2023-05-081-1/+0
|\
| * diff.h: reduce unnecessary includesElijah Newren2023-04-241-1/+0
| * Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano2023-04-041-4/+1
| |\
* | \ Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano2023-04-061-4/+1
|\ \ \ | | |/ | |/|
| * | post-cocci: adjust comments for recent repo_* migrationÆvar Arnfjörð Bjarmason2023-03-281-1/+1
| * | cocci: apply the "diff.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-3/+0
* | | Merge branch 'jk/format-patch-ignore-noprefix'Junio C Hamano2023-03-211-0/+2
|\ \ \ | |_|/ |/| |
| * | diff: factor out src/dst prefix setupJeff King2023-03-091-0/+2
| |/
* | Merge branch 'en/header-cleanup'Junio C Hamano2023-03-171-2/+1
|\ \ | |/ |/|
| * diff.h: remove unnecessary include of object.hElijah Newren2023-02-231-1/+0
| * object.h: stop depending on cache.h; make cache.h depend on object.hElijah Newren2023-02-231-1/+1
* | Merge branch 'jc/diff-algo-attribute'Junio C Hamano2023-02-271-0/+1
|\ \ | |/ |/|
| * diff: teach diff to read algorithm from diff driverJohn Cai2023-02-211-0/+1
* | Merge branch 'rs/diff-parseopts'Junio C Hamano2022-12-191-1/+1
|\ \ | |/ |/|
| * diff: remove parseopts member from struct diff_optionsRené Scharfe2022-12-021-1/+0
| * diff: factor out add_diff_options()René Scharfe2022-12-021-0/+1
* | patch-id: use stable patch-id for rebasesJerry Zhang2022-10-241-1/+1
|/
* Merge branch 'js/diff-filter-negation-fix'Junio C Hamano2022-02-161-1/+1
|\
| * diff-filter: be more careful when looking for negative bitsJohannes Schindelin2022-01-281-1/+1
* | diff: add ability to insert additional headers for pathsElijah Newren2022-02-021-1/+2
|/
* diff.h: move pickaxe fields together againÆvar Arnfjörð Bjarmason2021-05-111-2/+1
* pickaxe: die when --find-object and --pickaxe-all are combinedÆvar Arnfjörð Bjarmason2021-05-111-0/+2
* pickaxe: die when -G and --pickaxe-regex are combinedÆvar Arnfjörð Bjarmason2021-05-111-0/+2
* Merge branch 'jc/diffcore-rotate'Junio C Hamano2021-02-251-0/+21
|\
| * diff: --{rotate,skip}-to=<path>Junio C Hamano2021-02-161-0/+21
* | diff: add an API for deferred freeingÆvar Arnfjörð Bjarmason2021-02-111-1/+14
|/
* Merge branch 'sj/untracked-files-in-submodule-directory-is-not-dirty'Junio C Hamano2021-01-251-0/+1
|\
| * diff: do not show submodule with untracked files as "-dirty"Sangeeta Jain2020-12-081-0/+1
* | Merge branch 'mk/diff-ignore-regex'Junio C Hamano2020-11-021-0/+4
|\ \
| * | diff: add -I<regex> that ignores matching changesMichał Kępień2020-10-201-0/+4
* | | Merge branch 'dl/diff-merge-base'Junio C Hamano2020-11-021-1/+6
|\ \ \ | |_|/ |/| |
| * | builtin/diff-index: learn --merge-baseDenton Liu2020-09-201-0/+1
| * | diff-lib: define diff_get_merge_base()Denton Liu2020-09-201-0/+2
| * | diff-lib: accept option flags in run_diff_index()Denton Liu2020-09-201-1/+3
* | | Merge branch 'so/combine-diff-simplify'Junio C Hamano2020-10-051-3/+3
|\ \ \
| * | | diff: get rid of redundant 'dense' argumentSergey Organov2020-09-291-3/+3
| | |/ | |/|
* | | Merge branch 'tb/bloom-improvements'Junio C Hamano2020-09-291-2/+0
|\ \ \
| * | | bloom/diff: properly short-circuit on max_changesDerrick Stolee2020-09-171-2/+0
| | |/ | |/|
* | | diff-lib: tighten show_interdiff()'s interfaceEric Sunshine2020-09-081-1/+6
* | | diff: move show_interdiff() from its own file to diff-libEric Sunshine2020-09-081-0/+2
|/ /
* | diff.h: drop diff_tree_oid() & friends' return valueSZEDER Gábor2020-06-081-5/+5
|/
* diff: halt tree-diff early after max_changesDerrick Stolee2020-03-301-0/+5
* Merge branch 'hw/doc-in-header'Junio C Hamano2019-12-161-0/+126
|\
| * diff: move doc to diff.h and diffcore.hHeba Waly2019-11-181-0/+126
* | diff: export diffstat interfaceDaniel Ferreira2019-11-141-0/+20
|/
* patch-id: convert to use the_hash_algobrian m. carlson2019-08-191-1/+1
* range-diff: suppress line count in outer diffThomas Gummerer2019-07-111-0/+1
* Merge branch 'sb/format-patch-base-patch-id-fix'Junio C Hamano2019-06-131-1/+2
|\
| * format-patch: make --base patch-id output stableStephen Boyd2019-05-081-1/+2
View Lorry Controller Status