summaryrefslogtreecommitdiffstats
path: root/diff.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-241-0/+1
* alloc.h: move ALLOC_GROW() functions from cache.hElijah Newren2023-02-241-0/+1
* Merge branch 'jk/ext-diff-with-relative'Junio C Hamano2023-01-161-17/+13
|\
| * diff: drop "name" parameter from prepare_temp_file()Jeff King2023-01-061-11/+10
| * diff: clean up external-diff argv setupJeff King2023-01-061-6/+3
| * diff: use filespec path to set up tempfiles for ext-diffJeff King2023-01-061-1/+1
* | Merge branch 'pg/diff-stat-unmerged-regression-fix'Junio C Hamano2022-12-261-1/+1
|\ \
| * | diff: fix regression with --stat and unmerged filePeter Grayson2022-12-151-1/+1
* | | Merge branch 'jk/unused-post-2.39'Junio C Hamano2022-12-261-9/+9
|\ \ \
| * | | diff: mark unused parameters in callbacksJeff King2022-12-131-3/+4
| * | | ws: drop unused parameter from ws_blank_line()Jeff King2022-12-131-6/+5
| | |/ | |/|
* | | Merge branch 'rs/diff-parseopts'Junio C Hamano2022-12-191-11/+8
|\ \ \ | |/ / |/| |
| * | diff: remove parseopts member from struct diff_optionsRené Scharfe2022-12-021-14/+1
| * | diff: use add_diff_options() in diff_opt_parse()René Scharfe2022-12-021-1/+5
| * | diff: factor out add_diff_options()René Scharfe2022-12-021-0/+6
* | | Merge branch 'sg/plug-line-log-leaks'Junio C Hamano2022-11-281-8/+9
|\ \ \
| * | | diff.c: use diff_free_queue()SZEDER Gábor2022-11-031-8/+2
| * | | line-log: free diff queue when processing non-merge commitsSZEDER Gábor2022-11-031-0/+7
* | | | Merge branch 'rs/no-more-run-command-v'Taylor Blau2022-11-081-14/+13
|\ \ \ \ | |/ / / |/| | |
| * | | use child_process members "args" and "env" directlyRené Scharfe2022-10-301-14/+13
| |/ /
* | | Merge branch 'jz/patch-id'Taylor Blau2022-10-311-37/+38
|\ \ \
| * | | patch-id: fix patch-id for mode changesJerry Zhang2022-10-251-0/+5
| * | | patch-id: use stable patch-id for rebasesJerry Zhang2022-10-251-8/+4
| * | | patch-id: fix stable patch id for binary / header-onlyJerry Zhang2022-10-251-29/+29
* | | | Merge branch 'tb/diffstat-with-utf8-strwidth'Junio C Hamano2022-10-281-11/+31
|\ \ \ \
| * | | | diff: leave NEEDWORK notes in show_stats() functionJunio C Hamano2022-10-221-0/+15
| | |_|/ | |/| |
| * | | diff.c: use utf8_strwidth() to count display widthTorsten Bögershausen2022-09-141-11/+16
* | | | diffstat_consume(): assert non-zero lengthJeff King2022-10-181-0/+3
| |_|/ |/| |
* | | Merge branch 'en/remerge-diff-fixes'Junio C Hamano2022-09-161-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-231-7/+20
|/ /
* / diff: use mks_tempfile_dt()René Scharfe2022-04-211-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-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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 14:07:53 +0100