diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-19 17:39:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-19 17:39:06 (GMT) |
| commit | 439b55b37c215da67aedd4bce8c6d471de4246e1 (patch) | |
| tree | ee8c80acb321a887b7ed6acb99642cd49833a6bd /Documentation | |
| parent | 65ed8684c4ef5a36f2d172f1cb8b88d993c0e4ec (diff) | |
| parent | 5e62cc14c36fa1d10a057ebe6fd2bba504422573 (diff) | |
| download | git-439b55b37c215da67aedd4bce8c6d471de4246e1.zip git-439b55b37c215da67aedd4bce8c6d471de4246e1.tar.gz git-439b55b37c215da67aedd4bce8c6d471de4246e1.tar.bz2 | |
Merge branch 'rr/column-doc' into maint
* rr/column-doc:
column doc: rewrite documentation for column.ui
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 6e53fc5..0a7bd06 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -930,6 +930,9 @@ column.ui:: This variable consists of a list of tokens separated by spaces or commas: + +These options control when the feature should be enabled +(defaults to 'never'): ++ -- `always`;; always show in columns @@ -937,19 +940,30 @@ column.ui:: never show in columns `auto`;; show in columns if the output is to the terminal +-- ++ +These options control layout (defaults to 'column'). Setting any +of these implies 'always' if none of 'always', 'never', or 'auto' are +specified. ++ +-- `column`;; - fill columns before rows (default) + fill columns before rows `row`;; fill rows before columns `plain`;; show in one column +-- ++ +Finally, these options can be combined with a layout option (defaults +to 'nodense'): ++ +-- `dense`;; make unequal size columns to utilize more space `nodense`;; make equal size columns -- -+ -This option defaults to 'never'. column.branch:: Specify whether to output branch listing in `git branch` in columns. |