summaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorLines
2024-09-08diff: report dirty submodules as changes in builtin_diff()René Scharfe-0/+2
2024-09-08diff: report copies and renames as changes in run_diff_cmd()René Scharfe-0/+3
2024-07-08Merge branch 'ps/leakfixes-more'Junio C Hamano-2/+6
2024-07-02Merge branch 'rs/diff-color-moved-w-no-ext-diff-fix'Junio C Hamano-1/+2
2024-07-02Merge branch 'ps/use-the-repository'Junio C Hamano-3/+6
2024-06-24diff: allow --color-moved with --no-ext-diffRené Scharfe-1/+2
2024-06-20Merge branch 'rs/diff-exit-code-with-external-diff'Junio C Hamano-16/+52
2024-06-14global: introduce `USE_THE_REPOSITORY_VARIABLE` macroPatrick Steinhardt-0/+3
2024-06-14hash: require hash algorithm in `oidread()` and `oidclr()`Patrick Steinhardt-3/+3
2024-06-11revision: free diff optionsPatrick Steinhardt-2/+6
2024-06-10diff: let external diffs report that changes are uninterestingRené Scharfe-1/+35
2024-06-10userdiff: add and use struct external_diffRené Scharfe-15/+17
2024-06-07diff: cast string constant in `fill_textconv()`Patrick Steinhardt-1/+1
2024-06-07global: improve const correctness when assigning string constantsPatrick Steinhardt-2/+2
2024-05-27config: clarify memory ownership in `git_config_string()`Patrick Steinhardt-4/+4
2024-05-27diff: refactor code to clarify memory ownership of prefixesPatrick Steinhardt-8/+10
2024-05-27config: clarify memory ownership in `git_config_pathname()`Patrick Steinhardt-1/+1
2024-05-16Merge branch 'rs/external-diff-with-exit-code'Junio C Hamano-30/+3
2024-05-16Revert "diff: fix --exit-code with external diff"Junio C Hamano-30/+3
2024-05-15Merge branch 'rs/external-diff-with-exit-code'Junio C Hamano-3/+31
2024-05-06diff: fix --exit-code with external diffRené Scharfe-3/+30
2024-05-06diff: report unmerged paths as changes in run_diff_cmd()René Scharfe-0/+1
2024-03-15diff: add diff.srcPrefix and diff.dstPrefix configuration variablesPeter Hutterer-2/+12
2024-02-15Merge branch 'jx/dirstat-parseopt-help'Junio C Hamano-3/+3
2024-02-14diff: mark param1 and param2 as placeholdersJiang Xin-3/+3
2024-02-06Merge branch 'jk/diff-external-with-no-index'Junio C Hamano-1/+2
2024-01-29diff: handle NULL meta-info when spawning external diffJeff King-1/+2
2024-01-08Merge branch 'en/header-cleanup'Junio C Hamano-2/+0
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren-2/+0
2023-12-09diff: give more detailed messages for bogus diff.* configJeff King-2/+6
2023-12-09config: handle NULL value when parsing non-boolsJeff King-3/+16
2023-11-02Merge branch 'jk/diff-result-code-cleanup' into maint-2.42Junio C Hamano-4/+2
2023-11-02Merge branch 'jc/diff-exit-code-with-w-fixes' into maint-2.42Junio C Hamano-15/+25
2023-09-29diff --stat: set the width defaults in a helper functionDragan Simic-0/+7
2023-09-18diff --stat: add config option to limit filename widthDragan Simic-2/+9
2023-09-01Merge branch 'jk/diff-result-code-cleanup'Junio C Hamano-4/+2
2023-08-30Merge branch 'jc/diff-exit-code-with-w-fixes'Junio C Hamano-15/+25
2023-08-21diff: the -w option breaks --exit-code for --raw and other output modesJunio C Hamano-0/+6
2023-08-21diff: drop useless "status" parameter from diff_result_code()Jeff King-4/+2
2023-08-18diff: teach "--stat -w --exit-code" to notice differencesJunio C Hamano-0/+1
2023-08-18diff: mode-only change should be noticed by "--patch -w --exit-code"Junio C Hamano-0/+3
2023-08-18diff: move the fallback "--exit-code" code downJunio C Hamano-15/+15
2023-07-17Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano-2/+0
2023-07-06Merge branch 'gc/config-context'Junio C Hamano-8/+11
2023-07-06Merge branch 'pb/complete-diff-options'Junio C Hamano-0/+4
2023-07-05git-compat-util: move alloc macros to git-compat-util.hCalvin Wan-1/+0
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan-1/+0
2023-06-28config: pass kvi to die_bad_number()Glen Choo-4/+5
2023-06-28config: add ctx arg to config_fn_tGlen Choo-4/+6
2023-06-26diff.c: mention completion above add_diff_optionsPhilippe Blain-0/+4