diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-11-02 03:10:56 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-11-02 03:10:56 +0400 |
commit | eee947fb95dfa160d924824518dbfcb350c10aa5 (patch) | |
tree | 02453e85c4c78cb4fb2a35557c86ac47dafdb468 | |
parent | dddc411f7abbd82f6fa7d323711b8a7b94a1abc2 (diff) | |
parent | f01cae918feb564da8c7a286b32c7c917599acdd (diff) |
Merge branch 'jc/maint-diffstat-numstat-context' into maint
* 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); } |