summaryrefslogtreecommitdiffstats
path: root/diff.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-071-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-261-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-171-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-171-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-261-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-101-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-161-1/+1
| * | | diff: correct warning message when renameLimit exceededElijah Newren2021-07-161-1/+1
| | |/ | |/|
* | | Merge branch 'ab/pickaxe-pcre2'Junio C Hamano2021-07-141-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-141-6/+4
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 19:32:55 +0100