summaryrefslogtreecommitdiffstats
path: root/diff.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/external-diff-with-exit-code'Junio C Hamano2024-05-161-30/+3
|\
| * Revert "diff: fix --exit-code with external diff"Junio C Hamano2024-05-161-30/+3
* | Merge branch 'rs/external-diff-with-exit-code'Junio C Hamano2024-05-151-3/+31
|\|
| * diff: fix --exit-code with external diffRené Scharfe2024-05-061-3/+30
| * diff: report unmerged paths as changes in run_diff_cmd()René Scharfe2024-05-061-0/+1
* | diff: add diff.srcPrefix and diff.dstPrefix configuration variablesPeter Hutterer2024-03-151-2/+12
|/
* Merge branch 'jx/dirstat-parseopt-help'Junio C Hamano2024-02-161-3/+3
|\
| * diff: mark param1 and param2 as placeholdersJiang Xin2024-02-141-3/+3
| * Merge branch 'jk/diff-result-code-cleanup' into maint-2.42Junio C Hamano2023-11-021-4/+2
| |\
| * \ Merge branch 'jc/diff-exit-code-with-w-fixes' into maint-2.42Junio C Hamano2023-11-021-15/+25
| |\ \
* | \ \ Merge branch 'jk/diff-external-with-no-index'Junio C Hamano2024-02-061-1/+2
|\ \ \ \
| * | | | diff: handle NULL meta-info when spawning external diffJeff King2024-01-291-1/+2
* | | | | Merge branch 'en/header-cleanup'Junio C Hamano2024-01-081-2/+0
|\ \ \ \ \
| * | | | | treewide: remove unnecessary includes in source filesElijah Newren2023-12-261-2/+0
| |/ / / /
* | | | | diff: give more detailed messages for bogus diff.* configJeff King2023-12-091-2/+6
* | | | | config: handle NULL value when parsing non-boolsJeff King2023-12-091-3/+16
|/ / / /
* | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 14:05:16 +0100