From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 12 Sep 2016 22:34:31 +0000 (-0700)
Subject: Merge branch 'jk/diff-submodule-diff-inline'
X-Git-Tag: v2.11.0-rc0~167
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/305d7f133956a5f43c94d938beabbfbb0ac1753c

Merge branch 'jk/diff-submodule-diff-inline'

The "git diff --submodule={short,log}" mechanism has been enhanced
to allow "--submodule=diff" to show the patch between the submodule
commits bound to the superproject.

* jk/diff-submodule-diff-inline:
diff: teach diff to display submodule difference with an inline diff
submodule: refactor show_submodule_summary with helper function
submodule: convert show_submodule_summary to use struct object_id *
allow do_submodule_path to work even if submodule isn't checked out
diff: prepare for additional submodule formats
graph: add support for --line-prefix on all graph-aware output
diff.c: remove output_prefix_length field
cache: add empty_tree_oid object and helper function
---

305d7f133956a5f43c94d938beabbfbb0ac1753c