summaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorLines
2023-02-27Merge branch 'jc/diff-algo-attribute'Junio C Hamano-23/+67
2023-02-21diff: teach diff to read algorithm from diff driverJohn Cai-9/+24
2023-02-21diff: consolidate diff algorithm option parsingJohn Cai-14/+43
2023-01-16Merge branch 'jk/ext-diff-with-relative'Junio C Hamano-17/+13
2023-01-06diff: drop "name" parameter from prepare_temp_file()Jeff King-11/+10
2023-01-06diff: clean up external-diff argv setupJeff King-6/+3
2023-01-06diff: use filespec path to set up tempfiles for ext-diffJeff King-1/+1
2022-12-26Merge branch 'pg/diff-stat-unmerged-regression-fix'Junio C Hamano-1/+1
2022-12-26Merge branch 'jk/unused-post-2.39'Junio C Hamano-9/+9
2022-12-19Merge branch 'rs/diff-parseopts'Junio C Hamano-11/+8
2022-12-15diff: fix regression with --stat and unmerged filePeter Grayson-1/+1
2022-12-13diff: mark unused parameters in callbacksJeff King-3/+4
2022-12-13ws: drop unused parameter from ws_blank_line()Jeff King-6/+5
2022-12-02diff: remove parseopts member from struct diff_optionsRené Scharfe-14/+1
2022-12-02diff: use add_diff_options() in diff_opt_parse()René Scharfe-1/+5
2022-12-02diff: factor out add_diff_options()René Scharfe-0/+6
2022-11-28Merge branch 'sg/plug-line-log-leaks'Junio C Hamano-8/+9
2022-11-08Merge branch 'rs/no-more-run-command-v'Taylor Blau-14/+13
2022-11-02diff.c: use diff_free_queue()SZEDER Gábor-8/+2
2022-11-02line-log: free diff queue when processing non-merge commitsSZEDER Gábor-0/+7
2022-10-30Merge branch 'jz/patch-id'Taylor Blau-37/+38
2022-10-30use child_process members "args" and "env" directlyRené Scharfe-14/+13
2022-10-28Merge branch 'tb/diffstat-with-utf8-strwidth'Junio C Hamano-11/+31
2022-10-24patch-id: fix patch-id for mode changesJerry Zhang-0/+5
2022-10-24patch-id: use stable patch-id for rebasesJerry Zhang-8/+4
2022-10-24patch-id: fix stable patch id for binary / header-onlyJerry Zhang-29/+29
2022-10-21diff: leave NEEDWORK notes in show_stats() functionJunio C Hamano-0/+15
2022-10-17diffstat_consume(): assert non-zero lengthJeff King-0/+3
2022-09-15Merge branch 'en/remerge-diff-fixes'Junio C Hamano-6/+26
2022-09-14diff.c: use utf8_strwidth() to count display widthTorsten Bögershausen-11/+16
2022-09-14Merge branch 'ab/unused-annotation'Junio C Hamano-2/+2
2022-09-14Merge branch 'jk/unused-annotation'Junio C Hamano-2/+3
2022-09-02diff: fix filtering of merge commits under --remerge-diffElijah Newren-0/+1
2022-09-02diff: fix filtering of additional headers under --remerge-diffElijah Newren-0/+2
2022-09-02diff: have submodule_format logic avoid additional diff headersElijah Newren-6/+23
2022-09-01git-compat-util.h: use "UNUSED", not "UNUSED(var)"Ævar Arnfjörð Bjarmason-2/+2
2022-08-19hashmap: mark unused callback parametersJeff King-1/+1
2022-08-19config: mark unused callback parametersJeff King-1/+2
2022-08-19parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --optionsSZEDER Gábor-1/+1
2022-07-18Merge branch 'ab/cocci-unused'Junio C Hamano-2/+0
2022-07-06cocci: add and apply a rule to find "unused" strbufsÆvar Arnfjörð Bjarmason-2/+0
2022-06-22merge-ort: make `path_messages` a strmap to a string_listJohannes Schindelin-7/+20
2022-04-20diff: use mks_tempfile_dt()René Scharfe-7/+1
2022-03-23Merge branch 'ab/plug-random-leaks'Junio C Hamano-2/+9
2022-03-17diff.c: fix a double-free regression in a18d66cefbÆvar Arnfjörð Bjarmason-2/+9
2022-03-13Merge branch 'ab/plug-random-leaks'Junio C Hamano-0/+1
2022-03-06Merge branch 'ac/usage-string-fixups'Junio C Hamano-1/+1
2022-03-04diff.c: free "buf" in diff_words_flush()Ævar Arnfjörð Bjarmason-0/+1
2022-02-25Merge branch 'ab/diff-free-more'Junio C Hamano-0/+2
2022-02-23amend remaining usage strings according to style guideAbhradeep Chakraborty-1/+1