diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-01 14:31:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-01 14:31:18 -0700 |
| commit | a195230280e159899bd277641eb24efa7c6d1603 (patch) | |
| tree | 2b871f83080d996813ed0b6914fe3b88c35f6b08 /config.txt | |
| parent | 1b5a38274423dd3999d7f8d89c77c5a601686166 (diff) | |
| download | git-htmldocs-a195230280e159899bd277641eb24efa7c6d1603.tar.gz | |
Autogenerated HTML docs for v1.8.3.2-701-g8c4e4ec
Diffstat (limited to 'config.txt')
| -rw-r--r-- | config.txt | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/config.txt b/config.txt index 1153585aa..b4d4887bd 100644 --- a/config.txt +++ b/config.txt @@ -934,6 +934,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 @@ -941,19 +944,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. |