summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2022-02-16Merge branch 'js/diff-filter-negation-fix'Libravatar Junio C Hamano1-53/+44
2022-02-16Merge branch 'en/remerge-diff'Libravatar Junio C Hamano1-4/+120
2022-02-02diff: add ability to insert additional headers for pathsLibravatar Elijah Newren1-4/+120
2022-01-28diff-filter: be more careful when looking for negative bitsLibravatar Johannes Schindelin1-16/+7
2022-01-28diff.c: move the diff filter bits definitions up a bitLibravatar Johannes Schindelin1-37/+37
2022-01-10Merge branch 'ja/i18n-similar-messages'Libravatar Junio C Hamano1-4/+8
2022-01-05Merge branch 'pw/diff-color-moved-fix'Libravatar Junio C Hamano1-245/+186
2022-01-05i18n: turn even more messages into "cannot be used together" onesLibravatar Jean-Noël Avila1-4/+8
2022-01-05i18n: refactor "%s, %s and %s are mutually exclusive"Libravatar Jean-Noël Avila1-1/+1
2021-12-09diff --color-moved: intern stringsLibravatar Phillip Wood1-78/+96
2021-12-09diff: use designated initializers for emitted_diff_symbolLibravatar Phillip Wood1-1/+3
2021-12-09diff --color-moved-ws=allow-indentation-change: improve hash lookupsLibravatar Phillip Wood1-46/+19
2021-12-09diff --color-moved: stop clearing potential moved blocksLibravatar Phillip Wood1-11/+0
2021-12-09diff --color-moved: shrink potential moved blocks as we goLibravatar Phillip Wood1-36/+8
2021-12-09diff --color-moved: unify moved block growth functionsLibravatar Phillip Wood1-29/+12
2021-12-09diff --color-moved: call comparison function directlyLibravatar Phillip Wood1-4/+7
2021-12-09diff --color-moved-ws=allow-indentation-change: simplify and optimizeLibravatar Phillip Wood1-50/+20
2021-12-09diff: simplify allow-indentation-change delta calculationLibravatar Phillip Wood1-11/+2
2021-12-09diff --color-moved: avoid false short line matches and bad zebra coloringLibravatar Phillip Wood1-6/+11
2021-12-09diff --color-moved=zebra: fix alternate coloringLibravatar Phillip Wood1-2/+2
2021-12-09diff --color-moved: rewind when discarding pmbLibravatar Phillip Wood1-5/+23
2021-12-09diff --color-moved: factor out functionLibravatar Phillip Wood1-17/+34
2021-12-09diff --color-moved: clear all flags on blocks that are too shortLibravatar Phillip Wood1-3/+3
2021-11-25run-command API users: use strvec_push(), not argv constructionLibravatar Ævar Arnfjörð Bjarmason1-6/+2
2021-09-27*.[ch] *_INIT macros: use { 0 } for a "zero out" idiomLibravatar Ævar Arnfjörð Bjarmason1-2/+2
2021-09-09diff: ignore sparse paths in diffstatLibravatar Derrick Stolee1-0/+8
2021-08-06Merge branch 'ab/pickaxe-pcre2'Libravatar Junio C Hamano1-1/+1
2021-08-04diff: --pickaxe-all typofixLibravatar Bagas Sanjaya1-1/+1
2021-07-28Merge branch 'en/rename-limits-doc'Libravatar Junio C Hamano1-2/+2
2021-07-15rename: bump limit defaults yet againLibravatar Elijah Newren1-1/+1
2021-07-15diff: correct warning message when renameLimit exceededLibravatar Elijah Newren1-1/+1
2021-07-13Merge branch 'ab/pickaxe-pcre2'Libravatar Junio C Hamano1-14/+25
2021-05-14Merge branch 'pw/word-diff-zero-width-matches'Libravatar Junio C Hamano1-3/+7
2021-05-11xdiff-interface: replace discard_hunk_line() with a flagLibravatar Ævar Arnfjörð Bjarmason1-3/+4
2021-05-11xdiff-interface: prepare for allowing early returnLibravatar Ævar Arnfjörð Bjarmason1-11/+15
2021-05-11pickaxe: die when --find-object and --pickaxe-all are combinedLibravatar Ævar Arnfjörð Bjarmason1-0/+3
2021-05-11pickaxe: die when -G and --pickaxe-regex are combinedLibravatar Ævar Arnfjörð Bjarmason1-0/+3
2021-05-05word diff: handle zero length matchesLibravatar Phillip Wood1-3/+7
2021-04-27hash: provide per-algorithm null OIDsLibravatar brian m. carlson1-2/+2
2021-04-27Use the final_oid_fn to finalize hashing of object IDsLibravatar brian m. carlson1-1/+1
2021-03-13use CALLOC_ARRAYLibravatar René Scharfe1-6/+4
2021-02-25Merge branch 'jc/diffcore-rotate'Libravatar Junio C Hamano1-0/+21
2021-02-16diff: --{rotate,skip}-to=<path>Libravatar Junio C Hamano1-0/+21
2021-02-11diff: plug memory leak from regcomp() on {log,diff} -ILibravatar Ævar Arnfjörð Bjarmason1-0/+12
2021-02-11diff: add an API for deferred freeingLibravatar Ævar Arnfjörð Bjarmason1-4/+16
2021-01-25Merge branch 'sj/untracked-files-in-submodule-directory-is-not-dirty'Libravatar Junio C Hamano1-0/+3
2020-12-18Merge branch 'jc/diff-I-status-fix'Libravatar Junio C Hamano1-1/+2
2020-12-16diff: correct interaction between --exit-code and -I<pattern>Libravatar Junio C Hamano1-1/+2
2020-12-08diff: do not show submodule with untracked files as "-dirty"Libravatar Sangeeta Jain1-0/+3
2020-11-21Merge branch 'en/strmap'Libravatar Junio C Hamano1-2/+2