diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-06 22:53:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-06 22:53:06 (GMT) |
| commit | af050219e44051426179248614a046896b5d40c0 (patch) | |
| tree | 5f778353648283755312ad61f26aa6f1c3759601 /contrib | |
| parent | 556c5e030f17efb412a192a430fe9027840ed718 (diff) | |
| parent | df44483a5dde62f4b49c80fd90d7fe12ddcfb084 (diff) | |
| download | git-af050219e44051426179248614a046896b5d40c0.zip git-af050219e44051426179248614a046896b5d40c0.tar.gz git-af050219e44051426179248614a046896b5d40c0.tar.bz2 | |
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
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 33f0e4d..fba076d 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2092,6 +2092,7 @@ _git_config () core.whitespace core.worktree diff.autorefreshindex + diff.statGraphWidth diff.external diff.ignoreSubmodules diff.mnemonicprefix |