summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2022-09-15Merge branch 'en/remerge-diff-fixes'Junio C Hamano1-6/+26
2022-09-14Merge branch 'ab/unused-annotation'Junio C Hamano1-2/+2
2022-09-14Merge branch 'jk/unused-annotation'Junio C Hamano1-2/+3
2022-09-02diff: fix filtering of merge commits under --remerge-diffElijah Newren1-0/+1
2022-09-02diff: fix filtering of additional headers under --remerge-diffElijah Newren1-0/+2
2022-09-02diff: have submodule_format logic avoid additional diff headersElijah Newren1-6/+23
2022-09-01git-compat-util.h: use "UNUSED", not "UNUSED(var)"Ævar Arnfjörð Bjarmason1-2/+2
2022-08-19hashmap: mark unused callback parametersJeff King1-1/+1
2022-08-19config: mark unused callback parametersJeff King1-1/+2
2022-08-19parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --optionsSZEDER Gábor1-1/+1
2022-07-18Merge branch 'ab/cocci-unused'Junio C Hamano1-2/+0
2022-07-06cocci: add and apply a rule to find "unused" strbufsÆvar Arnfjörð Bjarmason1-2/+0
2022-06-22merge-ort: make `path_messages` a strmap to a string_listJohannes Schindelin1-7/+20
2022-04-20diff: use mks_tempfile_dt()René Scharfe1-7/+1
2022-03-23Merge branch 'ab/plug-random-leaks'Junio C Hamano1-2/+9
2022-03-17diff.c: fix a double-free regression in a18d66cefbÆvar Arnfjörð Bjarmason1-2/+9
2022-03-13Merge branch 'ab/plug-random-leaks'Junio C Hamano1-0/+1
2022-03-06Merge branch 'ac/usage-string-fixups'Junio C Hamano1-1/+1
2022-03-04diff.c: free "buf" in diff_words_flush()Ævar Arnfjörð Bjarmason1-0/+1
2022-02-25Merge branch 'ab/diff-free-more'Junio C Hamano1-0/+2
2022-02-23amend remaining usage strings according to style guideAbhradeep Chakraborty1-1/+1
2022-02-16Merge branch 'js/diff-filter-negation-fix'Junio C Hamano1-53/+44
2022-02-16Merge branch 'en/remerge-diff'Junio C Hamano1-4/+120
2022-02-16diff.[ch]: have diff_free() free options->parseoptsÆvar Arnfjörð Bjarmason1-0/+1
2022-02-16diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec)Ævar Arnfjörð Bjarmason1-0/+1
2022-02-02diff: add ability to insert additional headers for pathsElijah Newren1-4/+120
2022-01-28diff-filter: be more careful when looking for negative bitsJohannes Schindelin1-16/+7
2022-01-28diff.c: move the diff filter bits definitions up a bitJohannes Schindelin1-37/+37
2022-01-10Merge branch 'ja/i18n-similar-messages'Junio C Hamano1-4/+8
2022-01-05Merge branch 'pw/diff-color-moved-fix'Junio C Hamano1-243/+184
2022-01-05i18n: turn even more messages into "cannot be used together" onesJean-Noël Avila1-4/+8
2022-01-05i18n: refactor "%s, %s and %s are mutually exclusive"Jean-Noël Avila1-1/+1
2021-12-09diff --color-moved: intern stringsPhillip Wood1-78/+96
2021-12-09diff: use designated initializers for emitted_diff_symbolPhillip Wood1-1/+3
2021-12-09diff --color-moved-ws=allow-indentation-change: improve hash lookupsPhillip Wood1-45/+18
2021-12-09diff --color-moved: stop clearing potential moved blocksPhillip Wood1-11/+0
2021-12-09diff --color-moved: shrink potential moved blocks as we goPhillip Wood1-36/+8
2021-12-09diff --color-moved: unify moved block growth functionsPhillip Wood1-29/+12
2021-12-09diff --color-moved: call comparison function directlyPhillip Wood1-4/+7
2021-12-09diff --color-moved-ws=allow-indentation-change: simplify and optimizePhillip Wood1-49/+19
2021-12-09diff: simplify allow-indentation-change delta calculationPhillip Wood1-11/+2
2021-12-09diff --color-moved: avoid false short line matches and bad zebra coloringPhillip Wood1-6/+11
2021-12-09diff --color-moved=zebra: fix alternate coloringPhillip Wood1-2/+2
2021-12-09diff --color-moved: rewind when discarding pmbPhillip Wood1-5/+23
2021-12-09diff --color-moved: factor out functionPhillip Wood1-17/+34
2021-12-09diff --color-moved: clear all flags on blocks that are too shortPhillip Wood1-3/+3
2021-11-25run-command API users: use strvec_push(), not argv constructionÆvar Arnfjörð Bjarmason1-6/+2
2021-09-27*.[ch] *_INIT macros: use { 0 } for a "zero out" idiomÆvar Arnfjörð Bjarmason1-2/+2
2021-09-09diff: ignore sparse paths in diffstatDerrick Stolee1-0/+8
2021-08-06Merge branch 'ab/pickaxe-pcre2'Junio C Hamano1-1/+1