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
This commit is contained in:
1
diff.c
1
diff.c
@ -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;
|
||||
|
||||
Reference in New Issue
Block a user