diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-10 10:06:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-10 10:06:53 -0700 |
| commit | 9aa620dfae29183c57ecc351a097f9553d1b1ac1 (patch) | |
| tree | 5a24f5193fdbba1eb13de0944220f4f27407bc64 /git-difftool.perl | |
| parent | Start preparing for 1.7.10.2 (diff) | |
| parent | t4052: work around shells unable to set COLUMNS to 1 (diff) | |
| download | tgif-9aa620dfae29183c57ecc351a097f9553d1b1ac1.tar.xz | |
Merge branch 'lp/diffstat-with-graph' into maint
"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 (3)
* lp/diffstat-with-graph:
t4052: work around shells unable to set COLUMNS to 1
test-lib: skip test with COLUMNS=1 under mksh
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
Diffstat (limited to 'git-difftool.perl')
0 files changed, 0 insertions, 0 deletions