kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'rr/column-doc' 

* rr/column-doc:
  column doc: rewrite documentation for column.ui
maint
Junio C Hamano 2013-07-01 12:41:46 -07:00
parent 43f25ae7b8 5e62cc14c3
commit 66929c423a
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Documentation/config.txt
View File

@ -934,6 +934,9 @@ column.ui::
This variable consists of a list of tokens separated by spaces This variable consists of a list of tokens separated by spaces
or commas: or commas:
+ +
These options control when the feature should be enabled
(defaults to 'never'):
+
-- --
`always`;; `always`;;
always show in columns always show in columns
@ -941,19 +944,30 @@ column.ui::
never show in columns never show in columns
`auto`;; `auto`;;
show in columns if the output is to the terminal 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`;; `column`;;
fill columns before rows (default) fill columns before rows
`row`;; `row`;;
fill rows before columns fill rows before columns
`plain`;; `plain`;;
show in one column show in one column
--
+
Finally, these options can be combined with a layout option (defaults
to 'nodense'):
+
--
`dense`;; `dense`;;
make unequal size columns to utilize more space make unequal size columns to utilize more space
`nodense`;; `nodense`;;
make equal size columns make equal size columns
-- --
+
This option defaults to 'never'.


column.branch:: column.branch::
Specify whether to output branch listing in `git branch` in columns. Specify whether to output branch listing in `git branch` in columns.