diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-10-23 14:45:54 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-10-23 14:45:54 -0700 |
commit | 33be82183d4cd6dc645f64da1402cf9a3f4cdbf3 (patch) | |
tree | 4a681cad5c6da23a7d7f56022666fb31397026d2 /git-merge-tree.txt | |
parent | 359f02427091f2c0fcac4eb7651fe5d159b84a54 (diff) | |
download | git-htmldocs-33be82183d4cd6dc645f64da1402cf9a3f4cdbf3.tar.gz |
Autogenerated HTML docs for v2.42.0-482-g2e8e7
Diffstat (limited to 'git-merge-tree.txt')
-rw-r--r-- | git-merge-tree.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-merge-tree.txt b/git-merge-tree.txt index ffc4fbf7e..b50acace3 100644 --- a/git-merge-tree.txt +++ b/git-merge-tree.txt @@ -19,12 +19,12 @@ DESCRIPTION This command has a modern `--write-tree` mode and a deprecated `--trivial-merge` mode. With the exception of the <<DEPMERGE,DEPRECATED DESCRIPTION>> section at the end, the rest of -this documentation describes modern `--write-tree` mode. +this documentation describes the modern `--write-tree` mode. Performs a merge, but does not make any new commits and does not read from or write to either the working tree or index. -The performed merge will use the same feature as the "real" +The performed merge will use the same features as the "real" linkgit:git-merge[1], including: * three way content merges of individual files @@ -253,7 +253,7 @@ Do NOT attempt to guess or make the user guess the conflict types from the <<CFI,Conflicted file info>> list. The information there is insufficient to do so. For example: Rename/rename(1to2) conflicts (both sides renamed the same file differently) will result in three different -file having higher order stages (but each only has one higher order +files having higher order stages (but each only has one higher order stage), with no way (short of the <<IM,Informational messages>> section) to determine which three files are related. File/directory conflicts also result in a file with exactly one higher order stage. @@ -263,7 +263,7 @@ a file with exactly one higher order stage. In all cases, the <<IM,Informational messages>> section has the necessary info, though it is not designed to be machine parseable. -Do NOT assume that each paths from <<CFI,Conflicted file info>>, and +Do NOT assume that each path from <<CFI,Conflicted file info>>, and the logical conflicts in the <<IM,Informational messages>> have a one-to-one mapping, nor that there is a one-to-many mapping, nor a many-to-one mapping. Many-to-many mappings exist, meaning that each |