summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ja/i18n-similar-messages'Junio C Hamano2022-01-101-4/+8
|\
| * i18n: turn even more messages into "cannot be used together" onesJean-Noël Avila2022-01-051-4/+8
| * i18n: refactor "%s, %s and %s are mutually exclusive"Jean-Noël Avila2022-01-051-1/+1
* | Merge branch 'pw/diff-color-moved-fix'Junio C Hamano2022-01-051-245/+186
|\ \ | |/ |/|
| * diff --color-moved: intern stringsPhillip Wood2021-12-091-78/+96
| * diff: use designated initializers for emitted_diff_symbolPhillip Wood2021-12-091-1/+3
| * diff --color-moved-ws=allow-indentation-change: improve hash lookupsPhillip Wood2021-12-091-46/+19
| * diff --color-moved: stop clearing potential moved blocksPhillip Wood2021-12-091-11/+0
| * diff --color-moved: shrink potential moved blocks as we goPhillip Wood2021-12-091-36/+8
| * diff --color-moved: unify moved block growth functionsPhillip Wood2021-12-091-29/+12
| * diff --color-moved: call comparison function directlyPhillip Wood2021-12-091-4/+7
| * diff --color-moved-ws=allow-indentation-change: simplify and optimizePhillip Wood2021-12-091-50/+20
| * diff: simplify allow-indentation-change delta calculationPhillip Wood2021-12-091-11/+2
| * diff --color-moved: avoid false short line matches and bad zebra coloringPhillip Wood2021-12-091-6/+11
| * diff --color-moved=zebra: fix alternate coloringPhillip Wood2021-12-091-2/+2
| * diff --color-moved: rewind when discarding pmbPhillip Wood2021-12-091-5/+23
| * diff --color-moved: factor out functionPhillip Wood2021-12-091-17/+34
| * diff --color-moved: clear all flags on blocks that are too shortPhillip Wood2021-12-091-3/+3
* | run-command API users: use strvec_push(), not argv constructionÆvar Arnfjörð Bjarmason2021-11-251-6/+2
* | *.[ch] *_INIT macros: use { 0 } for a "zero out" idiomÆvar Arnfjörð Bjarmason2021-09-271-2/+2
* | diff: ignore sparse paths in diffstatDerrick Stolee2021-09-091-0/+8
* | Merge branch 'ab/pickaxe-pcre2'Junio C Hamano2021-08-061-1/+1
|\ \
| * | diff: --pickaxe-all typofixBagas Sanjaya2021-08-041-1/+1
* | | Merge branch 'en/rename-limits-doc'Junio C Hamano2021-07-281-2/+2
|\ \ \
| * | | rename: bump limit defaults yet againElijah Newren2021-07-151-1/+1
| * | | diff: correct warning message when renameLimit exceededElijah Newren2021-07-151-1/+1
| | |/ | |/|
* | | Merge branch 'ab/pickaxe-pcre2'Junio C Hamano2021-07-131-14/+25
|\ \ \ | |/ / |/| / | |/
| * xdiff-interface: replace discard_hunk_line() with a flagÆvar Arnfjörð Bjarmason2021-05-111-3/+4
| * xdiff-interface: prepare for allowing early returnÆvar Arnfjörð Bjarmason2021-05-111-11/+15
| * pickaxe: die when --find-object and --pickaxe-all are combinedÆvar Arnfjörð Bjarmason2021-05-111-0/+3
| * pickaxe: die when -G and --pickaxe-regex are combinedÆvar Arnfjörð Bjarmason2021-05-111-0/+3
* | Merge branch 'pw/word-diff-zero-width-matches'Junio C Hamano2021-05-141-3/+7
|\ \
| * | word diff: handle zero length matchesPhillip Wood2021-05-051-3/+7
| |/
* | hash: provide per-algorithm null OIDsbrian m. carlson2021-04-271-2/+2
* | Use the final_oid_fn to finalize hashing of object IDsbrian m. carlson2021-04-271-1/+1
|/
* use CALLOC_ARRAYRené Scharfe2021-03-131-6/+4
* 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: plug memory leak from regcomp() on {log,diff} -IÆvar Arnfjörð Bjarmason2021-02-111-0/+12
* | diff: add an API for deferred freeingÆvar Arnfjörð Bjarmason2021-02-111-4/+16
|/
* Merge branch 'sj/untracked-files-in-submodule-directory-is-not-dirty'Junio C Hamano2021-01-251-0/+3
|\
| * diff: do not show submodule with untracked files as "-dirty"Sangeeta Jain2020-12-081-0/+3
* | Merge branch 'jc/diff-I-status-fix'Junio C Hamano2020-12-181-1/+2
|\ \
| * | diff: correct interaction between --exit-code and -I<pattern>Junio C Hamano2020-12-161-1/+2
* | | Merge branch 'en/strmap'Junio C Hamano2020-11-211-2/+2
|\ \ \
| * | | hashmap: provide deallocation function namesElijah Newren2020-11-021-2/+2
| | |/ | |/|
* | | Merge branch 'jk/diff-release-filespec-fix'Junio C Hamano2020-11-211-0/+3
|\ \ \
| * | | diff: allow passing NULL to diff_free_filespec_data()Jinoh Kang2020-11-061-0/+3
| |/ /
* | | Merge branch 'mk/diff-ignore-regex'Junio C Hamano2020-11-021-0/+23
|\ \ \ | |/ / |/| / | |/
| * diff: add -I<regex> that ignores matching changesMichał Kępień2020-10-201-0/+23
View Lorry Controller Status