summaryrefslogtreecommitdiff
path: root/t/t5100/0001mboxrd
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-12 15:34:31 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-12 15:34:31 -0700
commit305d7f133956a5f43c94d938beabbfbb0ac1753c (patch)
tree6f3324895e1885de1a7369da012c5132b9104176 /t/t5100/0001mboxrd
parentSync with maint (diff)
parentdiff: teach diff to display submodule difference with an inline diff (diff)
downloadtgif-305d7f133956a5f43c94d938beabbfbb0ac1753c.tar.xz
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
Diffstat (limited to 't/t5100/0001mboxrd')
0 files changed, 0 insertions, 0 deletions