diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-04-15 12:41:01 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-15 12:41:01 -0700 |
commit | f678d9b5923b030287687dde020240c2d4709d79 (patch) | |
tree | a6babe23bb662184627559dc8658daece06fa174 /diff.c | |
parent | 825ccfc23c7834152323586d8470666315dd4347 (diff) | |
parent | 0f33a0677d6d93b3f6d8fb7d1df62f30eb7b73a9 (diff) | |
download | git-f678d9b5923b030287687dde020240c2d4709d79.tar.gz |
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
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -2255,6 +2255,7 @@ static void builtin_diff(const char *name_a, const char *del = diff_get_color_opt(o, DIFF_FILE_OLD); const char *add = diff_get_color_opt(o, DIFF_FILE_NEW); show_submodule_summary(o->file, one ? one->path : two->path, + line_prefix, one->sha1, two->sha1, two->dirty_submodule, meta, del, add, reset); return; |