Merge branch 'sb/show-diff-for-submodule-in-diff-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Apr 2017 06:29:32 +0000 (23:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Apr 2017 06:29:32 +0000 (23:29 -0700)
"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.

1  2 
submodule.c
diff --cc submodule.c
Simple merge