summaryrefslogtreecommitdiffstats
path: root/diff.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* packfile: pass down repository to `has_object[_kept]_pack`Karthik Nayak2024-12-041-1/+2
* Merge branch 'jk/output-prefix-cleanup'Junio C Hamano2024-10-101-7/+3
|\
| * diff: return const char from output_prefix callbackJeff King2024-10-031-6/+3
| * diff: drop line_prefix_length fieldJeff King2024-10-031-1/+0
* | diff: improve lifecycle management of diff queuesPatrick Steinhardt2024-09-301-10/+12
* | Merge branch 'ps/leakfixes-part-7' into ps/leakfixes-part-8Junio C Hamano2024-09-301-2/+5
|\ \
| * | diff: fix leaking orderfile optionPatrick Steinhardt2024-09-271-2/+5
* | | Merge branch 'rs/diff-exit-code-binary'Junio C Hamano2024-09-261-0/+1
|\ \ \
| * | | diff: report modified binary files as changes in builtin_diff()René Scharfe2024-09-231-0/+1
| | |/ | |/|
* | | Merge branch 'jc/range-diff-lazy-setup'Junio C Hamano2024-09-161-1/+9
|\ \ \ | |_|/ |/| |
| * | remerge-diff: clean up temporary objdir at a central placeJunio C Hamano2024-08-101-1/+9
| * | Merge branch 'jk/diff-external-with-no-index' into maint-2.43Junio C Hamano2024-02-131-1/+2
| |\ \
| * \ \ Merge branch 'en/header-cleanup' into maint-2.43Junio C Hamano2024-02-091-2/+0
| |\ \ \
* | \ \ \ Merge branch 'rs/diff-exit-code-fix'Junio C Hamano2024-09-141-0/+5
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | diff: report dirty submodules as changes in builtin_diff()René Scharfe2024-09-081-0/+2
| * | | | diff: report copies and renames as changes in run_diff_cmd()René Scharfe2024-09-081-0/+3
* | | | | diff: free state populated via optionsPatrick Steinhardt2024-08-141-0/+10
* | | | | diff: fix leak when parsing invalid ignore regex optionPatrick Steinhardt2024-08-141-1/+5
|/ / / /
* | | | Merge branch 'ps/leakfixes-more'Junio C Hamano2024-07-081-2/+6
|\ \ \ \
| * | | | revision: free diff optionsPatrick Steinhardt2024-06-111-2/+6
* | | | | Merge branch 'rs/diff-color-moved-w-no-ext-diff-fix'Junio C Hamano2024-07-021-1/+2
|\ \ \ \ \
| * | | | | diff: allow --color-moved with --no-ext-diffRené Scharfe2024-06-241-1/+2
* | | | | | Merge branch 'ps/use-the-repository'Junio C Hamano2024-07-021-3/+6
|\ \ \ \ \ \
| * | | | | | global: introduce `USE_THE_REPOSITORY_VARIABLE` macroPatrick Steinhardt2024-06-141-0/+3
| * | | | | | hash: require hash algorithm in `oidread()` and `oidclr()`Patrick Steinhardt2024-06-141-3/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rs/diff-exit-code-with-external-diff'Junio C Hamano2024-06-211-16/+52
|\ \ \ \ \ \
| * | | | | | diff: let external diffs report that changes are uninterestingRené Scharfe2024-06-101-1/+35
| * | | | | | userdiff: add and use struct external_diffRené Scharfe2024-06-101-15/+17
| |/ / / / /
* | | | | | diff: cast string constant in `fill_textconv()`Patrick Steinhardt2024-06-071-1/+1
* | | | | | global: improve const correctness when assigning string constantsPatrick Steinhardt2024-06-071-2/+2
|/ / / / /
* | | | | config: clarify memory ownership in `git_config_string()`Patrick Steinhardt2024-05-271-4/+4
* | | | | diff: refactor code to clarify memory ownership of prefixesPatrick Steinhardt2024-05-271-8/+10
* | | | | config: clarify memory ownership in `git_config_pathname()`Patrick Steinhardt2024-05-271-1/+1
* | | | | 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