diff options
Diffstat (limited to 'man1/git-merge.1')
| -rw-r--r-- | man1/git-merge.1 | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/man1/git-merge.1 b/man1/git-merge.1 index a4fccb93c..79268a84e 100644 --- a/man1/git-merge.1 +++ b/man1/git-merge.1 @@ -2,12 +2,12 @@ .\" Title: git-merge .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-MERGE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-MERGE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -424,7 +424,7 @@ For conflicting paths, the index file records up to three versions: stage 1 stor \fBHEAD\fR, and stage 3 from \fBMERGE_HEAD\fR (you can inspect the stages with -\fBgit ls\-files \-u\fR)\&. The working tree files contain the result of the "merge" program; i\&.e\&. 3\-way merge results with familiar conflict markers +\fBgit ls\-files \-u\fR)\&. The working tree files contain the result of the merge operation; i\&.e\&. 3\-way merge results with familiar conflict markers \fB<<<\fR \fB===\fR \fB>>>\fR\&. @@ -438,6 +438,21 @@ For conflicting paths, the index file records up to three versions: stage 1 stor .sp -1 .IP " 5." 4.2 .\} +A special ref +\fBAUTO_MERGE\fR +is written, pointing to a tree corresponding to the current content of the working tree (including conflict markers for textual conflicts)\&. Note that this ref is only written when the +\fIort\fR +merge strategy is used (the default)\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04' 6.\h'+01'\c +.\} +.el \{\ +.sp -1 +.IP " 6." 4.2 +.\} No other changes are made\&. In particular, the local modifications you had before you started merge will stay the same and the index entries for them stay as they were, i\&.e\&. matching \fBHEAD\fR\&. .RE @@ -612,6 +627,8 @@ will show a three\-way diff, highlighting changes from both the and \fBMERGE_HEAD\fR versions\&. +\fBgit diff AUTO_MERGE\fR +will show what changes you\(cqve made so far to resolve textual conflicts\&. .RE .sp .RS 4 |