Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | packfile: pass down repository to `has_object[_kept]_pack` | Karthik Nayak | 2024-12-04 | 1 | -1/+2 |
* | Merge branch 'jk/output-prefix-cleanup' | Junio C Hamano | 2024-10-10 | 1 | -7/+3 |
|\ | |||||
| * | diff: return const char from output_prefix callback | Jeff King | 2024-10-03 | 1 | -6/+3 |
| * | diff: drop line_prefix_length field | Jeff King | 2024-10-03 | 1 | -1/+0 |
* | | diff: improve lifecycle management of diff queues | Patrick Steinhardt | 2024-09-30 | 1 | -10/+12 |
* | | Merge branch 'ps/leakfixes-part-7' into ps/leakfixes-part-8 | Junio C Hamano | 2024-09-30 | 1 | -2/+5 |
|\ \ | |||||
| * | | diff: fix leaking orderfile option | Patrick Steinhardt | 2024-09-27 | 1 | -2/+5 |
* | | | Merge branch 'rs/diff-exit-code-binary' | Junio C Hamano | 2024-09-26 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | diff: report modified binary files as changes in builtin_diff() | René Scharfe | 2024-09-23 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'jc/range-diff-lazy-setup' | Junio C Hamano | 2024-09-16 | 1 | -1/+9 |
|\ \ \ | |_|/ |/| | | |||||
| * | | remerge-diff: clean up temporary objdir at a central place | Junio C Hamano | 2024-08-10 | 1 | -1/+9 |
| * | | Merge branch 'jk/diff-external-with-no-index' into maint-2.43 | Junio C Hamano | 2024-02-13 | 1 | -1/+2 |
| |\ \ | |||||
| * \ \ | Merge branch 'en/header-cleanup' into maint-2.43 | Junio C Hamano | 2024-02-09 | 1 | -2/+0 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'rs/diff-exit-code-fix' | Junio C Hamano | 2024-09-14 | 1 | -0/+5 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | diff: report dirty submodules as changes in builtin_diff() | René Scharfe | 2024-09-08 | 1 | -0/+2 |
| * | | | | diff: report copies and renames as changes in run_diff_cmd() | René Scharfe | 2024-09-08 | 1 | -0/+3 |
* | | | | | diff: free state populated via options | Patrick Steinhardt | 2024-08-14 | 1 | -0/+10 |
* | | | | | diff: fix leak when parsing invalid ignore regex option | Patrick Steinhardt | 2024-08-14 | 1 | -1/+5 |
|/ / / / | |||||
* | | | | Merge branch 'ps/leakfixes-more' | Junio C Hamano | 2024-07-08 | 1 | -2/+6 |
|\ \ \ \ | |||||
| * | | | | revision: free diff options | Patrick Steinhardt | 2024-06-11 | 1 | -2/+6 |
* | | | | | Merge branch 'rs/diff-color-moved-w-no-ext-diff-fix' | Junio C Hamano | 2024-07-02 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | diff: allow --color-moved with --no-ext-diff | René Scharfe | 2024-06-24 | 1 | -1/+2 |
* | | | | | | Merge branch 'ps/use-the-repository' | Junio C Hamano | 2024-07-02 | 1 | -3/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | global: introduce `USE_THE_REPOSITORY_VARIABLE` macro | Patrick Steinhardt | 2024-06-14 | 1 | -0/+3 |
| * | | | | | | hash: require hash algorithm in `oidread()` and `oidclr()` | Patrick Steinhardt | 2024-06-14 | 1 | -3/+3 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'rs/diff-exit-code-with-external-diff' | Junio C Hamano | 2024-06-21 | 1 | -16/+52 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: let external diffs report that changes are uninteresting | René Scharfe | 2024-06-10 | 1 | -1/+35 |
| * | | | | | | userdiff: add and use struct external_diff | René Scharfe | 2024-06-10 | 1 | -15/+17 |
| |/ / / / / | |||||
* | | | | | | diff: cast string constant in `fill_textconv()` | Patrick Steinhardt | 2024-06-07 | 1 | -1/+1 |
* | | | | | | global: improve const correctness when assigning string constants | Patrick Steinhardt | 2024-06-07 | 1 | -2/+2 |
|/ / / / / | |||||
* | | | | | config: clarify memory ownership in `git_config_string()` | Patrick Steinhardt | 2024-05-27 | 1 | -4/+4 |
* | | | | | diff: refactor code to clarify memory ownership of prefixes | Patrick Steinhardt | 2024-05-27 | 1 | -8/+10 |
* | | | | | config: clarify memory ownership in `git_config_pathname()` | Patrick Steinhardt | 2024-05-27 | 1 | -1/+1 |
* | | | | | Merge branch 'rs/external-diff-with-exit-code' | Junio C Hamano | 2024-05-16 | 1 | -30/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Revert "diff: fix --exit-code with external diff" | Junio C Hamano | 2024-05-16 | 1 | -30/+3 |
* | | | | | | Merge branch 'rs/external-diff-with-exit-code' | Junio C Hamano | 2024-05-15 | 1 | -3/+31 |
|\| | | | | | |/ / / / |/| | | | | |||||
| * | | | | diff: fix --exit-code with external diff | René Scharfe | 2024-05-06 | 1 | -3/+30 |
| * | | | | diff: report unmerged paths as changes in run_diff_cmd() | René Scharfe | 2024-05-06 | 1 | -0/+1 |
* | | | | | diff: add diff.srcPrefix and diff.dstPrefix configuration variables | Peter Hutterer | 2024-03-15 | 1 | -2/+12 |
|/ / / / | |||||
* | | | | Merge branch 'jx/dirstat-parseopt-help' | Junio C Hamano | 2024-02-16 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | diff: mark param1 and param2 as placeholders | Jiang Xin | 2024-02-14 | 1 | -3/+3 |
| * | | | | Merge branch 'jk/diff-result-code-cleanup' into maint-2.42 | Junio C Hamano | 2023-11-02 | 1 | -4/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jc/diff-exit-code-with-w-fixes' into maint-2.42 | Junio C Hamano | 2023-11-02 | 1 | -15/+25 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'jk/diff-external-with-no-index' | Junio C Hamano | 2024-02-06 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | diff: handle NULL meta-info when spawning external diff | Jeff King | 2024-01-29 | 1 | -1/+2 |
* | | | | | | | Merge branch 'en/header-cleanup' | Junio C Hamano | 2024-01-08 | 1 | -2/+0 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | treewide: remove unnecessary includes in source files | Elijah Newren | 2023-12-26 | 1 | -2/+0 |
| |/ / / / | |||||
* | | | | | diff: give more detailed messages for bogus diff.* config | Jeff King | 2023-12-09 | 1 | -2/+6 |
* | | | | | config: handle NULL value when parsing non-bools | Jeff King | 2023-12-09 | 1 | -3/+16 |
|/ / / / | |||||
* | | | | diff --stat: set the width defaults in a helper function | Dragan Simic | 2023-09-30 | 1 | -0/+7 |