From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 2 May 2012 20:51:59 +0000 (-0700)
Subject: Merge branch 'lp/diffstat-with-graph'
X-Git-Tag: v1.7.11-rc0~71
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=73ff8cf784b6ee447072fad6c06fd0eef0e9c9f6;p=git.git

Merge branch 'lp/diffstat-with-graph'

"log --graph" was not very friendly with "--stat" option and its output
had line breaks at wrong places.

By Lucian Poston (5) and Zbigniew Jędrzejewski-Szmek (2)
* lp/diffstat-with-graph:
  t4052: work around shells unable to set COLUMNS to 1
  Prevent graph_width of stat width from falling below min
  t4052: Test diff-stat output with minimum columns
  t4052: Adjust --graph --stat output for prefixes
  Adjust stat width calculations to take --graph output into account
  Add output_prefix_length to diff_options
  t4052: test --stat output with --graph
---

73ff8cf784b6ee447072fad6c06fd0eef0e9c9f6