Merge branch 'sb/show-diff-for-submodule-in-diff-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Apr 2017 07:55:11 +0000 (00:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Apr 2017 07:55:11 +0000 (00:55 -0700)
commit8d16ef369e5e3262e27bea3cc5a119dd0c0477da
tree66e09c4262754a79c83c9b5c89c8542d6fd4b8f0
parent9c20eba240ed97dcdb5cdc681eb28fad2996c90e
parent17b254cda6dd77b1a91ac6f2946943e52698efa9
Merge branch 'sb/show-diff-for-submodule-in-diff-fix' into next

"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