diff options
Diffstat (limited to 'man5/gitattributes.5')
| -rw-r--r-- | man5/gitattributes.5 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/man5/gitattributes.5 b/man5/gitattributes.5 index 83b7431f3..f96260201 100644 --- a/man5/gitattributes.5 +++ b/man5/gitattributes.5 @@ -2,12 +2,12 @@ .\" Title: gitattributes .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2024-01-30 +.\" Date: 2024-02-02 .\" Manual: Git Manual -.\" Source: Git 2.43.0.493.gbc7ee2e5e1 +.\" Source: Git 2.43.0.522.g2a540e432f .\" Language: English .\" -.TH "GITATTRIBUTES" "5" "2024\-01\-30" "Git 2\&.43\&.0\&.493\&.gbc7ee2" "Git Manual" +.TH "GITATTRIBUTES" "5" "2024\-02\-02" "Git 2\&.43\&.0\&.522\&.g2a540e" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1600,13 +1600,13 @@ To define a custom merge driver \fBfilfre\fR, add a section to your \fB$GIT_DIR/ .sp The \fBmerge\&.*\&.name\fR variable gives the driver a human\-readable name\&. .sp -The \(oqmerge\&.*\&.driver` variable\(cqs value is used to construct a command to run to merge ancestor\(cqs version (\fB%O\fR), current version (\fB%A\fR) and the other branches\(cq version (\fB%B\fR)\&. These three tokens are replaced with the names of temporary files that hold the contents of these versions when the command line is built\&. Additionally, %L will be replaced with the conflict marker size (see below)\&. +The \(oqmerge\&.*\&.driver` variable\(cqs value is used to construct a command to run to common ancestor\(cqs version (\fB%O\fR), current version (\fB%A\fR) and the other branches\(cq version (\fB%B\fR)\&. These three tokens are replaced with the names of temporary files that hold the contents of these versions when the command line is built\&. Additionally, \fB%L\fR will be replaced with the conflict marker size (see below)\&. .sp The merge driver is expected to leave the result of the merge in the file named with \fB%A\fR by overwriting it, and exit with zero status if it managed to merge them cleanly, or non\-zero if there were conflicts\&. When the driver crashes (e\&.g\&. killed by SEGV), it is expected to exit with non\-zero status that are higher than 128, and in such a case, the merge results in a failure (which is different from producing a conflict)\&. .sp The \fBmerge\&.*\&.recursive\fR variable specifies what other merge driver to use when the merge driver is called for an internal merge between common ancestors, when there are more than one\&. When left unspecified, the driver itself is used for both internal merge and the final merge\&. .sp -The merge driver can learn the pathname in which the merged result will be stored via placeholder \fB%P\fR\&. +The merge driver can learn the pathname in which the merged result will be stored via placeholder \fB%P\fR\&. The conflict labels to be used for the common ancestor, local head and other head can be passed by using \fI%S\fR, \fI%X\fR and \*(Aq%Y` respectively\&. .RE .sp .it 1 an-trap |