Merge branch 'sb/show-diff-for-submodule-in-diff-fix'
commit1776a710d615c77e3c66be2f4a08c36663f88a07
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Apr 2017 06:29:32 +0000 (16 23:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Apr 2017 06:29:32 +0000 (16 23:29 -0700)
treef19ebe6b05a8a73dcad416b30ca547cbbf0d8c5c
parent263fd041a8cb575e18331f0af39f4481039eaf34
parent17b254cda6dd77b1a91ac6f2946943e52698efa9
Merge branch 'sb/show-diff-for-submodule-in-diff-fix'

"git diff --submodule=diff" learned to work better in a project
with a submodule that in turn has its own submodules.

* sb/show-diff-for-submodule-in-diff-fix:
  diff: submodule inline diff to initialize env array.
submodule.c