diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-10-27 08:22:47 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-29 10:17:00 +0900 |
| commit | dbfc949f6fc360af5ce72ba572c5f9c3be4b3f60 (patch) | |
| tree | 318a7ba53051439d02344bf8c49c8799c8c5d8bc /Documentation/config.txt | |
| parent | 0a7839e3ccbfed4b3eff7e1e80ae24bbc23cf1ca (diff) | |
| download | git-dbfc949f6fc360af5ce72ba572c5f9c3be4b3f60.tar.gz | |
config.txt: move column.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 56 |
1 files changed, 1 insertions, 55 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 399c23e0c5..0618a7d974 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -311,61 +311,7 @@ include::config/clean.txt[] include::config/color.txt[] -column.ui:: - Specify whether supported commands should output in columns. - 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 -`never`;; - 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 -`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 --- - -column.branch:: - Specify whether to output branch listing in `git branch` in columns. - See `column.ui` for details. - -column.clean:: - Specify the layout when list items in `git clean -i`, which always - shows files and directories in columns. See `column.ui` for details. - -column.status:: - Specify whether to output untracked files in `git status` in columns. - See `column.ui` for details. - -column.tag:: - Specify whether to output tag listing in `git tag` in columns. - See `column.ui` for details. +include::config/column.txt[] commit.cleanup:: This setting overrides the default of the `--cleanup` option in |