diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-03-01 13:26:42 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-01 09:14:16 -0800 |
| commit | 7a7159ace6c93ea6c55086dfc7ba7533a3e3c07d (patch) | |
| tree | fa1dcd08622caca7841461bc7234f91d04da2c23 /builtin/merge.c | |
| parent | 5e0ec15eb131075d0c3e61b33bcc7931bbc8bc08 (diff) | |
| download | git-7a7159ace6c93ea6c55086dfc7ba7533a3e3c07d.tar.gz git-7a7159ace6c93ea6c55086dfc7ba7533a3e3c07d.tar.xz | |
merge --stat: use the full terminal width
Make merge --stat behave like diff --stat and use the full terminal
width.
Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index b4fbc60e6..b1cd90ccc 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -399,6 +399,7 @@ static void finish(struct commit *head_commit, if (new_head && show_diffstat) { struct diff_options opts; diff_setup(&opts); + opts.stat_width = -1; /* use full terminal width */ opts.output_format |= DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT; opts.detect_rename = DIFF_DETECT_RENAME; |