summaryrefslogtreecommitdiffstats
path: root/diff.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* diff --stat: set the width defaults in a helper functionDragan Simic2023-09-301-0/+7
* diff --stat: add config option to limit filename widthDragan Simic2023-09-181-2/+9
* Merge branch 'jk/diff-result-code-cleanup'Junio C Hamano2023-09-011-4/+2
|\
| * diff: drop useless "status" parameter from diff_result_code()Jeff King2023-08-221-4/+2
* | Merge branch 'jc/diff-exit-code-with-w-fixes'Junio C Hamano2023-08-301-15/+25
|\ \ | |/ |/|
| * diff: the -w option breaks --exit-code for --raw and other output modesJunio C Hamano2023-08-221-0/+6
| * diff: teach "--stat -w --exit-code" to notice differencesJunio C Hamano2023-08-191-0/+1
| * diff: mode-only change should be noticed by "--patch -w --exit-code"Junio C Hamano2023-08-191-0/+3
| * diff: move the fallback "--exit-code" code downJunio C Hamano2023-08-191-15/+15
* | Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano2023-07-171-2/+0
|\ \
| * | git-compat-util: move alloc macros to git-compat-util.hCalvin Wan2023-07-051-1/+0
| * | treewide: remove unnecessary includes for wrapper.hCalvin Wan2023-07-051-1/+0
* | | Merge branch 'gc/config-context'Junio C Hamano2023-07-061-8/+11
|\ \ \
| * | | config: pass kvi to die_bad_number()Glen Choo2023-06-281-4/+5
| * | | config: add ctx arg to config_fn_tGlen Choo2023-06-281-4/+6
* | | | Merge branch 'pb/complete-diff-options'Junio C Hamano2023-07-061-0/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | diff.c: mention completion above add_diff_optionsPhilippe Blain2023-06-261-0/+4
* | | | object-store-ll.h: split this header out of object-store.hElijah Newren2023-06-211-1/+1
* | | | merge-ll: rename from ll-mergeElijah Newren2023-06-211-1/+1
* | | | cache.h: remove this no-longer-used headerElijah Newren2023-06-211-1/+1
* | | | read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren2023-06-211-0/+1
| |/ / |/| |
* | | Merge branch 'jk/log-follow-with-non-literal-pathspec'Junio C Hamano2023-06-211-2/+27
|\ \ \
| * | | diff: detect pathspec magic not supported by --followJeff King2023-06-031-0/+15
| * | | diff: factor out --follow pathspec checkJeff King2023-06-031-2/+12
* | | | Merge branch 'jc/diff-s-with-other-options'Junio C Hamano2023-06-131-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-101-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-251-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
| | |_|/ | |/| |