Skip to content

Commit dbfc949

Browse files
pcloudsgitster
authored andcommitted
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>
1 parent 0a7839e commit dbfc949

File tree

2 files changed

+56
-55
lines changed

2 files changed

+56
-55
lines changed

Documentation/config.txt

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -311,61 +311,7 @@ include::config/clean.txt[]
311311

312312
include::config/color.txt[]
313313

314-
column.ui::
315-
Specify whether supported commands should output in columns.
316-
This variable consists of a list of tokens separated by spaces
317-
or commas:
318-
+
319-
These options control when the feature should be enabled
320-
(defaults to 'never'):
321-
+
322-
--
323-
`always`;;
324-
always show in columns
325-
`never`;;
326-
never show in columns
327-
`auto`;;
328-
show in columns if the output is to the terminal
329-
--
330-
+
331-
These options control layout (defaults to 'column'). Setting any
332-
of these implies 'always' if none of 'always', 'never', or 'auto' are
333-
specified.
334-
+
335-
--
336-
`column`;;
337-
fill columns before rows
338-
`row`;;
339-
fill rows before columns
340-
`plain`;;
341-
show in one column
342-
--
343-
+
344-
Finally, these options can be combined with a layout option (defaults
345-
to 'nodense'):
346-
+
347-
--
348-
`dense`;;
349-
make unequal size columns to utilize more space
350-
`nodense`;;
351-
make equal size columns
352-
--
353-
354-
column.branch::
355-
Specify whether to output branch listing in `git branch` in columns.
356-
See `column.ui` for details.
357-
358-
column.clean::
359-
Specify the layout when list items in `git clean -i`, which always
360-
shows files and directories in columns. See `column.ui` for details.
361-
362-
column.status::
363-
Specify whether to output untracked files in `git status` in columns.
364-
See `column.ui` for details.
365-
366-
column.tag::
367-
Specify whether to output tag listing in `git tag` in columns.
368-
See `column.ui` for details.
314+
include::config/column.txt[]
369315

370316
commit.cleanup::
371317
This setting overrides the default of the `--cleanup` option in

Documentation/config/column.txt

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
column.ui::
2+
Specify whether supported commands should output in columns.
3+
This variable consists of a list of tokens separated by spaces
4+
or commas:
5+
+
6+
These options control when the feature should be enabled
7+
(defaults to 'never'):
8+
+
9+
--
10+
`always`;;
11+
always show in columns
12+
`never`;;
13+
never show in columns
14+
`auto`;;
15+
show in columns if the output is to the terminal
16+
--
17+
+
18+
These options control layout (defaults to 'column'). Setting any
19+
of these implies 'always' if none of 'always', 'never', or 'auto' are
20+
specified.
21+
+
22+
--
23+
`column`;;
24+
fill columns before rows
25+
`row`;;
26+
fill rows before columns
27+
`plain`;;
28+
show in one column
29+
--
30+
+
31+
Finally, these options can be combined with a layout option (defaults
32+
to 'nodense'):
33+
+
34+
--
35+
`dense`;;
36+
make unequal size columns to utilize more space
37+
`nodense`;;
38+
make equal size columns
39+
--
40+
41+
column.branch::
42+
Specify whether to output branch listing in `git branch` in columns.
43+
See `column.ui` for details.
44+
45+
column.clean::
46+
Specify the layout when list items in `git clean -i`, which always
47+
shows files and directories in columns. See `column.ui` for details.
48+
49+
column.status::
50+
Specify whether to output untracked files in `git status` in columns.
51+
See `column.ui` for details.
52+
53+
column.tag::
54+
Specify whether to output tag listing in `git tag` in columns.
55+
See `column.ui` for details.

0 commit comments

Comments
 (0)