]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'pb/range-diff-with-submodule'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Jun 2022 22:53:41 +0000 (15:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Jun 2022 22:53:41 +0000 (15:53 -0700)
"git -c diff.submodule=log range-diff" did not show anything for
submodules that changed in the ranges being compared, and
"git -c diff.submodule=diff range-diff" did not work correctly.
Fix this by including the "--submodule=short" output
unconditionally to be compared.

* pb/range-diff-with-submodule:
  range-diff: show submodule changes irrespective of diff.submodule

1  2 
range-diff.c

diff --cc range-diff.c
Simple merge