]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca349c3 0f4b0d4)
Merge branch 'rs/diff-color-moved-w-no-ext-diff-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Jul 2024 16:59:02 +0000 (09:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Jul 2024 16:59:02 +0000 (09:59 -0700)
"git diff --no-ext-diff" when diff.external is configured ignored
the "--color-moved" option.

* rs/diff-color-moved-w-no-ext-diff-fix:
  diff: allow --color-moved with --no-ext-diff

1  2 
diff.c patch | diff1 | diff2 | blob | history

diff --cc diff.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.