aboutsummaryrefslogtreecommitdiffstats
path: root/repo-settings.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-01-16 12:07:46 -0800
committerJunio C Hamano <gitster@pobox.com>2023-01-16 12:07:46 -0800
commit1120c54c12788c232d96702702e719f72e7ece14 (patch)
treec639799d3b9e8fec8c9157f8a6a788049fbac14f /repo-settings.c
parentMerge branch 'ds/bundle-uri-4' (diff)
parentdiff: drop "name" parameter from prepare_temp_file() (diff)
downloadgit-1120c54c12788c232d96702702e719f72e7ece14.tar.gz
git-1120c54c12788c232d96702702e719f72e7ece14.zip
Merge branch 'jk/ext-diff-with-relative'
"git diff --relative" did not mix well with "git diff --ext-diff", which has been corrected. * jk/ext-diff-with-relative: diff: drop "name" parameter from prepare_temp_file() diff: clean up external-diff argv setup diff: use filespec path to set up tempfiles for ext-diff
Diffstat (limited to 'repo-settings.c')
0 files changed, 0 insertions, 0 deletions