]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 786a3e4) | patch
diff: allow --color-moved with --no-ext-diff
authorRené Scharfe <l.s.r@web.de>
Mon, 24 Jun 2024 19:15:45 +0000 (21:15 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Jun 2024 20:49:41 +0000 (13:49 -0700)
commit0f4b0d4cf0e192b770529b97712f31dcf365e118
tree62e707ce92eda719d811bab1467ddd8c5f415bcetree | snapshot
parent786a3e4b8d754d2b14b1208b98eeb0a554ef19a8commit | diff
diff: allow --color-moved with --no-ext-diff

We ignore the option --color-moved if an external diff program is
configured, presumably because its overhead is unnecessary in that case.
Respect the option if we don't actually use the external diff, though.

Reported-by: lolligerhans@gmx.de
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c diff | blob | blame | history
t/t4015-diff-whitespace.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.