]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit2d97b4e2358aa528f9406b3ca96981fcf89b0d11
tree76a676bb43358f80f27ab3c3d1010b87191388fatree | snapshot
parentca349c387b0c07ad4dcafabc4b07d1910aab9995commit | diff
parent0f4b0d4cf0e192b770529b97712f31dcf365e118commit | diff
Merge branch 'rs/diff-color-moved-w-no-ext-diff-fix'

"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
diff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.