summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/header-split-cache-h-part-3' into jchJunio C Hamano2023-05-171-3/+4
|\
| * object-store-ll.h: split this header out of object-store.hElijah Newren2023-05-161-1/+1
| * merge-ll: rename from ll-mergeElijah Newren2023-05-161-1/+1
| * cache.h: remove this no-longer-used headerElijah Newren2023-05-161-1/+1
| * read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren2023-05-161-0/+1
| * Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-pa...Junio C Hamano2023-05-081-0/+2
| |\
* | \ Merge branch 'jc/diff-s-with-other-options' into jchJunio C Hamano2023-05-171-11/+13
|\ \ \
| * | | diff: fix interaction between the "-s" option and other optionsJunio C Hamano2023-05-051-11/+13
* | | | Merge branch 'jc/dirstat-plug-leaks'Junio C Hamano2023-05-151-14/+20
|\ \ \ \ | |/ / /
| * | | diff: plug leaks in dirstatJunio C Hamano2023-05-051-6/+11
| * | | diff: refactor common tail part of dirstat computationJunio C Hamano2023-05-051-14/+15
* | | | Merge branch 'en/header-split-cache-h-part-2'Junio C Hamano2023-05-091-0/+2
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | ws.h: move declarations for ws.c functions from cache.hElijah Newren2023-04-241-0/+1
| * | base85.h: move declarations for base85.c functions from cache.hElijah Newren2023-04-241-0/+1
* | | 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
| | |/ / | |/| |
View Lorry Controller Status