summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/remerge-diff-fixes'Junio C Hamano2022-09-151-6/+26
|\
| * diff: fix filtering of merge commits under --remerge-diffElijah Newren2022-09-021-0/+1
| * diff: fix filtering of additional headers under --remerge-diffElijah Newren2022-09-021-0/+2
| * diff: have submodule_format logic avoid additional diff headersElijah Newren2022-09-021-6/+23
* | Merge branch 'ab/unused-annotation'Junio C Hamano2022-09-141-2/+2
|\ \
| * | git-compat-util.h: use "UNUSED", not "UNUSED(var)"Ævar Arnfjörð Bjarmason2022-09-011-2/+2
* | | Merge branch 'jk/unused-annotation'Junio C Hamano2022-09-141-2/+3
|\ \ \ | |/ /
| * | hashmap: mark unused callback parametersJeff King2022-08-191-1/+1
| * | config: mark unused callback parametersJeff King2022-08-191-1/+2
| |/
* | parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --optionsSZEDER Gábor2022-08-191-1/+1
|/
* Merge branch 'ab/cocci-unused'Junio C Hamano2022-07-181-2/+0
|\
| * cocci: add and apply a rule to find "unused" strbufsÆvar Arnfjörð Bjarmason2022-07-061-2/+0
* | merge-ort: make `path_messages` a strmap to a string_listJohannes Schindelin2022-06-221-7/+20
|/
* diff: use mks_tempfile_dt()René Scharfe2022-04-201-7/+1
* Merge branch 'ab/plug-random-leaks'Junio C Hamano2022-03-231-2/+9
|\
| * diff.c: fix a double-free regression in a18d66cefbÆvar Arnfjörð Bjarmason2022-03-171-2/+9
* | Merge branch 'ab/plug-random-leaks'Junio C Hamano2022-03-131-0/+1
|\ \ | |/
| * diff.c: free "buf" in diff_words_flush()Ævar Arnfjörð Bjarmason2022-03-041-0/+1
* | Merge branch 'ac/usage-string-fixups'Junio C Hamano2022-03-061-1/+1
|\ \ | |/ |/|
| * amend remaining usage strings according to style guideAbhradeep Chakraborty2022-02-231-1/+1
* | Merge branch 'ab/diff-free-more'Junio C Hamano2022-02-251-0/+2
|\ \ | |/ |/|
| * diff.[ch]: have diff_free() free options->parseoptsÆvar Arnfjörð Bjarmason2022-02-161-0/+1
| * diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec)Ævar Arnfjörð Bjarmason2022-02-161-0/+1
* | Merge branch 'js/diff-filter-negation-fix'Junio C Hamano2022-02-161-53/+44
|\ \
| * | diff-filter: be more careful when looking for negative bitsJohannes Schindelin2022-01-281-16/+7
| * | diff.c: move the diff filter bits definitions up a bitJohannes Schindelin2022-01-281-37/+37
| |/
* | Merge branch 'en/remerge-diff'Junio C Hamano2022-02-161-4/+120
|\ \ | |/ |/|
| * diff: add ability to insert additional headers for pathsElijah Newren2022-02-021-4/+120
* | 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
|\ \
View Lorry Controller Status