Merge branch 'jk/diff-graph-submodule-summary'
commitf678d9b5923b030287687dde020240c2d4709d79
authorJunio C Hamano <gitster@pobox.com>
Mon, 15 Apr 2013 19:41:01 +0000 (15 12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Apr 2013 19:41:01 +0000 (15 12:41 -0700)
treea6babe23bb662184627559dc8658daece06fa174
parent825ccfc23c7834152323586d8470666315dd4347
parent0f33a0677d6d93b3f6d8fb7d1df62f30eb7b73a9
Merge branch 'jk/diff-graph-submodule-summary'

Make "git diff --graph" work better with submodule log output.

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