]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5699ec1 04b1f1f)
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)
commitecbd60ae9980cb3f30f54270f39b464c1f8b39a2
tree87bd9067e88b71bff198a10a53a47c9e4eb34770tree | snapshot
parent5699ec1b0aec51b9e9ba5a2785f65970c5a95d84commit | diff
parent04b1f1fd9d9faeb90d7bd25d8eb4d3ffbb28b9f1commit | diff
Merge branch 'pb/range-diff-with-submodule'

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