1 files changed, 101 insertions, 3 deletions
diff --git a/man1/git-column.1 b/man1/git-column.1
index 819b995a1..c75fbafb8 100644
--- a/man1/git-column.1
+++ b/man1/git-column.1
@@ -2,12 +2,12 @@
 .\"     Title: git-column
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 09/13/2022
+.\"      Date: 09/14/2022
 .\"    Manual: Git Manual
-.\"    Source: Git 2.37.3.611.ge188ec3a73
+.\"    Source: Git 2.37.3.662.g36f8e7ed7d
 .\"  Language: English
 .\"
-.TH "GIT\-COLUMN" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual"
+.TH "GIT\-COLUMN" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -128,6 +128,104 @@ v2\&.4\&.8  v2\&.4\&.9
 .RE
 .\}
 .sp
+.SH "CONFIGURATION"
+.sp
+Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there:
+.PP
+column\&.ui
+.RS 4
+Specify whether supported commands should output in columns\&. This variable consists of a list of tokens separated by spaces or commas:
+.sp
+These options control when the feature should be enabled (defaults to
+\fInever\fR):
+.PP
+\fBalways\fR
+.RS 4
+always show in columns
+.RE
+.PP
+\fBnever\fR
+.RS 4
+never show in columns
+.RE
+.PP
+\fBauto\fR
+.RS 4
+show in columns if the output is to the terminal
+.RE
+.sp
+These options control layout (defaults to
+\fIcolumn\fR)\&. Setting any of these implies
+\fIalways\fR
+if none of
+\fIalways\fR,
+\fInever\fR, or
+\fIauto\fR
+are specified\&.
+.PP
+\fBcolumn\fR
+.RS 4
+fill columns before rows
+.RE
+.PP
+\fBrow\fR
+.RS 4
+fill rows before columns
+.RE
+.PP
+\fBplain\fR
+.RS 4
+show in one column
+.RE
+.sp
+Finally, these options can be combined with a layout option (defaults to
+\fInodense\fR):
+.PP
+\fBdense\fR
+.RS 4
+make unequal size columns to utilize more space
+.RE
+.PP
+\fBnodense\fR
+.RS 4
+make equal size columns
+.RE
+.RE
+.PP
+column\&.branch
+.RS 4
+Specify whether to output branch listing in
+\fBgit branch\fR
+in columns\&. See
+\fBcolumn\&.ui\fR
+for details\&.
+.RE
+.PP
+column\&.clean
+.RS 4
+Specify the layout when list items in
+\fBgit clean \-i\fR, which always shows files and directories in columns\&. See
+\fBcolumn\&.ui\fR
+for details\&.
+.RE
+.PP
+column\&.status
+.RS 4
+Specify whether to output untracked files in
+\fBgit status\fR
+in columns\&. See
+\fBcolumn\&.ui\fR
+for details\&.
+.RE
+.PP
+column\&.tag
+.RS 4
+Specify whether to output tag listing in
+\fBgit tag\fR
+in columns\&. See
+\fBcolumn\&.ui\fR
+for details\&.
+.RE
 .SH "GIT"
 .sp
 Part of the \fBgit\fR(1) suite