author | Junio C Hamano <gitster@pobox.com> | |
Tue, 6 Mar 2012 22:53:06 +0000 (14:53 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 6 Mar 2012 22:53:06 +0000 (14:53 -0800) | ||
commit | af050219e44051426179248614a046896b5d40c0 | |
tree | 5f778353648283755312ad61f26aa6f1c3759601 | tree | snapshot |
parent | 556c5e030f17efb412a192a430fe9027840ed718 | commit | diff |
parent | df44483a5dde62f4b49c80fd90d7fe12ddcfb084 | commit | diff |
Merge branch 'zj/diff-stat-dyncol'
By Zbigniew Jędrzejewski-Szmek (8) and Junio C Hamano (1)
* zj/diff-stat-dyncol:
: This breaks tests. Perhaps it is not worth using the decimal-width stuff
: for this series, at least initially.
diff --stat: add config option to limit graph width
diff --stat: enable limiting of the graph part
diff --stat: add a test for output with COLUMNS=40
diff --stat: use a maximum of 5/8 for the filename part
merge --stat: use the full terminal width
log --stat: use the full terminal width
show --stat: use the full terminal width
diff --stat: use the full terminal width
diff --stat: tests for long filenames and big change counts
By Zbigniew Jędrzejewski-Szmek (8) and Junio C Hamano (1)
* zj/diff-stat-dyncol:
: This breaks tests. Perhaps it is not worth using the decimal-width stuff
: for this series, at least initially.
diff --stat: add config option to limit graph width
diff --stat: enable limiting of the graph part
diff --stat: add a test for output with COLUMNS=40
diff --stat: use a maximum of 5/8 for the filename part
merge --stat: use the full terminal width
log --stat: use the full terminal width
show --stat: use the full terminal width
diff --stat: use the full terminal width
diff --stat: tests for long filenames and big change counts
Documentation/diff-options.txt | diff1 | | diff2 | | blob | history |
builtin/merge.c | diff1 | | diff2 | | blob | history |
contrib/completion/git-completion.bash | diff1 | | diff2 | | blob | history |
diff.c | diff1 | | diff2 | | blob | history |
diff.h | diff1 | | diff2 | | blob | history |