| commit | 8de07476bf9d007657eaa0b87f26678540e92092 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 23 Apr 2012 20:38:32 +0000 (23 13:38 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 23 Apr 2012 20:38:32 +0000 (23 13:38 -0700) | ||
| tree | 8b60556a0f5147f08a3711a68201fbf99fa5da72 | treesnapshot (tar.gz zip) |
| parent | 9b423260ab83d268027bb6b2290895101c174fcf | commitdiff |
| parent | 678c5741118729dc9072182bd368e0a3402dd4f1 | commitdiff |
Merge branch 'lp/diffstat-with-graph' into next
Looked reasonable.
Will merge to 'next'.
By Lucian Poston (5) and Zbigniew Jędrzejewski-Szmek (1)
* lp/diffstat-with-graph:
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
Looked reasonable.
Will merge to 'next'.
By Lucian Poston (5) and Zbigniew Jędrzejewski-Szmek (1)
* lp/diffstat-with-graph:
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
| diff.c | diff1 | diff2 | blobhistory |
| diff.h | diff1 | diff2 | blobhistory |