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>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 399c23e0c5480bfc179778b54eb9570801b6652d..0618a7d9741e75204d1ae1752c8b0c7851f14880 100644 (file)
--- 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

diff --git a/Documentation/config/column.txt b/Documentation/config/column.txt
new file mode 100644 (file)
index 0000000..76aa2f2
--- /dev/null
+++ b/Documentation/config/column.txt
@@ -0,0 +1,55 @@
+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.