OSDN Git Service

Merge branch 'jk/diff-submodule-diff-inline'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 May 2017 03:34:42 +0000 (12:34 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 May 2017 03:34:42 +0000 (12:34 +0900)
commita531ecf399a5d2ddb97dbd79bbcdad2dd93e7268
treea6052ef0b98bb1c4c1a8c171e69d1d4f7507a1da
parent4eeed27e16c71ceecdf5a2d51af4099bb12ff775
parent5a5221427cb8b78c3246ffa305900db935017c54
Merge branch 'jk/diff-submodule-diff-inline'

"git diff --submodule=diff" now recurses into nested submodules.

* jk/diff-submodule-diff-inline:
  diff: recurse into nested submodules for inline diff
submodule.c
t/t4060-diff-submodule-option-diff-format.sh