Merge branch 'jk/diff-graph-submodule-summary'
authorJunio C Hamano <gitster@pobox.com>
Mon, 15 Apr 2013 19:41:01 +0000 (12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Apr 2013 19:41:01 +0000 (12:41 -0700)
Make "git diff --graph" work better with submodule log output.

* jk/diff-graph-submodule-summary:
submodule: print graph output next to submodule log

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