diff options
Diffstat (limited to 'man1/git-config.1')
| -rw-r--r-- | man1/git-config.1 | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/man1/git-config.1 b/man1/git-config.1 index 70021a891..42b516bf8 100644 --- a/man1/git-config.1 +++ b/man1/git-config.1 @@ -2,12 +2,12 @@ .\" Title: git-config .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2024-03-28 +.\" Date: 2024-04-01 .\" Manual: Git Manual -.\" Source: Git 2.44.0.413.gd6fd04375f +.\" Source: Git 2.44.0.448.gc2cbfbd2e2 .\" Language: English .\" -.TH "GIT\-CONFIG" "1" "2024\-03\-28" "Git 2\&.44\&.0\&.413\&.gd6fd04" "Git Manual" +.TH "GIT\-CONFIG" "1" "2024\-04\-01" "Git 2\&.44\&.0\&.448\&.gc2cbfb" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -864,7 +864,7 @@ The Git configuration file contains a number of variables that affect the Git co The configuration variables are used by both the Git plumbing and the porcelain commands\&. The variables are divided into sections, wherein the fully qualified variable name of the variable itself is the last dot\-separated segment and the section name is everything before the last dot\&. The variable names are case\-insensitive, allow only alphanumeric characters and \fB\-\fR, and must start with an alphabetic character\&. Some variables may appear multiple times; we say then that the variable is multivalued\&. .SS "Syntax" .sp -The syntax is fairly flexible and permissive; whitespaces are mostly ignored\&. The \fI#\fR and \fI;\fR characters begin comments to the end of line, blank lines are ignored\&. +The syntax is fairly flexible and permissive\&. Whitespace characters, which in this context are the space character (SP) and the horizontal tabulation (HT), are mostly ignored\&. The \fI#\fR and \fI;\fR characters begin comments to the end of line\&. Blank lines are ignored\&. .sp The file consists of sections and variables\&. A section begins with the name of the section in square brackets and continues until the next section begins\&. Section names are case\-insensitive\&. Only alphanumeric characters, \fB\-\fR and \fB\&.\fR are allowed in section names\&. Each variable must belong to some section, which means that there must be a section header before the first setting of a variable\&. .sp @@ -887,9 +887,9 @@ There is also a deprecated \fB[section\&.subsection]\fR syntax\&. With this synt .sp All the other lines (and the remainder of the line after the section header) are recognized as setting variables, in the form \fIname = value\fR (or just \fIname\fR, which is a short\-hand to say that the variable is the boolean "true")\&. The variable names are case\-insensitive, allow only alphanumeric characters and \fB\-\fR, and must start with an alphabetic character\&. .sp -A line that defines a value can be continued to the next line by ending it with a \fB\e\fR; the backslash and the end\-of\-line are stripped\&. Leading whitespaces after \fIname =\fR, the remainder of the line after the first comment character \fI#\fR or \fI;\fR, and trailing whitespaces of the line are discarded unless they are enclosed in double quotes\&. Internal whitespaces within the value are retained verbatim\&. +Whitespace characters surrounding \fBname\fR, \fB=\fR and \fBvalue\fR are discarded\&. Internal whitespace characters within \fIvalue\fR are retained verbatim\&. Comments starting with either \fB#\fR or \fB;\fR and extending to the end of line are discarded\&. A line that defines a value can be continued to the next line by ending it with a backslash (\fB\e\fR); the backslash and the end\-of\-line characters are discarded\&. .sp -Inside double quotes, double quote \fB"\fR and backslash \fB\e\fR characters must be escaped: use \fB\e"\fR for \fB"\fR and \fB\e\e\fR for \fB\e\fR\&. +If \fBvalue\fR needs to contain leading or trailing whitespace characters, it must be enclosed in double quotation marks (\fB"\fR)\&. Inside double quotation marks, double quote (\fB"\fR) and backslash (\fB\e\fR) characters must be escaped: use \fB\e"\fR for \fB"\fR and \fB\e\e\fR for \fB\e\fR\&. .sp The following escape sequences (beside \fB\e"\fR and \fB\e\e\fR) are recognized: \fB\en\fR for newline character (NL), \fB\et\fR for horizontal tabulation (HT, TAB) and \fB\eb\fR for backspace (BS)\&. Other char escape sequences (including octal escape sequences) are invalid\&. .SS "Includes" @@ -1383,6 +1383,11 @@ implicitIdentity Shown when the user\(cqs information is guessed from the system username and domain name, to tell the user how to set their identity configuration\&. .RE .PP +mergeConflict +.RS 4 +Shown when various commands stop because of conflicts\&. +.RE +.PP nestedTag .RS 4 Shown when a user attempts to recursively tag a tag object\&. |