summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tb/ban-strtok'Junio C Hamano2023-05-021-1/+1
|\
| * string-list: multi-delimiter `string_list_split_in_place()`Taylor Blau2023-04-241-1/+1
* | Merge branch 'en/header-split-cache-h'Junio C Hamano2023-04-251-0/+5
|\ \ | |/ |/|
| * pager.h: move declarations for pager.c functions from cache.hElijah Newren2023-04-111-0/+1
| * object-file.h: move declarations for object-file.c functions from cache.hElijah Newren2023-04-111-0/+1
| * object-name.h: move declarations for object-name.c functions from cache.hElijah Newren2023-04-111-0/+1
| * treewide: be explicit about dependence on oid-array.hElijah Newren2023-04-111-0/+1
| * treewide: be explicit about dependence on convert.hElijah Newren2023-04-111-0/+1
| * Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano2023-04-041-3/+3
| |\
* | \ Merge branch 'en/header-split-cleanup'Junio C Hamano2023-04-061-0/+5
|\ \ \ | |/ /
| * | setup.h: move declarations for setup.c functions from cache.hElijah Newren2023-03-211-0/+1
| * | environment.h: move declarations for environment.c functions from cache.hElijah Newren2023-03-211-0/+1
| * | wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren2023-03-211-0/+1
| * | abspath.h: move absolute path functions from cache.hElijah Newren2023-03-211-0/+1
| * | treewide: be explicit about dependence on gettext.hElijah Newren2023-03-211-0/+1
* | | Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano2023-04-061-3/+3
|\ \ \ | | |/ | |/|
| * | cocci: apply the "promisor-remote.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
| * | cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-2/+2
* | | Merge branch 'jk/format-patch-ignore-noprefix'Junio C Hamano2023-03-211-5/+28
|\ \ \ | |_|/ |/| |
| * | diff: add --default-prefix optionJeff King2023-03-091-0/+14
| * | diff: factor out src/dst prefix setupJeff King2023-03-091-5/+14
| |/
* | Merge branch 'en/header-cleanup'Junio C Hamano2023-03-171-0/+2
|\ \ | |/ |/|
| * cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-231-0/+1
| * alloc.h: move ALLOC_GROW() functions from cache.hElijah Newren2023-02-231-0/+1
* | Merge branch 'jc/diff-algo-attribute'Junio C Hamano2023-02-271-23/+67
|\ \ | |/ |/|
| * diff: teach diff to read algorithm from diff driverJohn Cai2023-02-211-9/+24
| * diff: consolidate diff algorithm option parsingJohn Cai2023-02-211-14/+43
* | 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-021-8/+2
| * | | line-log: free diff queue when processing non-merge commitsSZEDER Gábor2022-11-021-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-301-37/+38
|\ \ \
| * | | patch-id: fix patch-id for mode changesJerry Zhang2022-10-241-0/+5
| * | | patch-id: use stable patch-id for rebasesJerry Zhang2022-10-241-8/+4
| * | | patch-id: fix stable patch id for binary / header-onlyJerry Zhang2022-10-241-29/+29
* | | | Merge branch 'tb/diffstat-with-utf8-strwidth'Junio C Hamano2022-10-281-11/+31
|\ \ \ \
View Lorry Controller Status