diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-10-11 02:56:18 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-10-11 02:56:18 +0400 |
commit | 7ddd582402aa926d5ec33d914ccc8bfaf1b15c06 (patch) | |
tree | 4c17578024416e93f4d429608d7522c1b226778c | |
parent | 034a8a0df392fa809a506d0da65b9245db939d8f (diff) | |
parent | f01cae918feb564da8c7a286b32c7c917599acdd (diff) |
Merge branch 'jc/maint-diffstat-numstat-context'
* jc/maint-diffstat-numstat-context:
diff: teach --stat/--numstat to honor -U$num
-rw-r--r-- | diff.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -2274,6 +2274,8 @@ static void builtin_diffstat(const char *name_a, const char *name_b, memset(&xpp, 0, sizeof(xpp)); memset(&xecfg, 0, sizeof(xecfg)); xpp.flags = o->xdl_opts; + xecfg.ctxlen = o->context; + xecfg.interhunkctxlen = o->interhunkcontext; xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat, &xpp, &xecfg); } |