]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7cbfd0e f034bb1)
Merge branch 'jk/ext-diff-with-relative' into maint-2.39
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2023 22:15:50 +0000 (14:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2023 22:15:51 +0000 (14:15 -0800)
commitf8382a639667aedb08afa95339d494d5ed6b370f
tree98fa6a7b6db99d9d4ccdf13f32e05cd7362a9438tree | snapshot
parent7cbfd0e572560040df3381efb91e3b52b524e128commit | diff
parentf034bb1cad862a678030cdf0ae833636f9d7dbcacommit | diff
Merge branch 'jk/ext-diff-with-relative' into maint-2.39

"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
Unnamed repository; edit this file 'description' to name the repository.