8c8e5bd6eb
When all of x/a, x/b, and x/c have moved to z/a, z/b, and z/c on one
branch, there is a question about whether x/d added on a different
branch should remain at x/d or appear at z/d when the two branches are
merged. There are different possible viewpoints here:
A) The file was placed at x/d; it's unrelated to the other files in
x/ so it doesn't matter that all the files from x/ moved to z/ on
one branch; x/d should still remain at x/d.
B) x/d is related to the other files in x/, and x/ was renamed to z/;
therefore x/d should be moved to z/d.
Since there was no ability to detect directory renames prior to
git-2.18, users experienced (A) regardless of context. Choice (B) was
implemented in git-2.18, with no option to go back to (A), and has been
in use since. However, one user reported that the merge results did not
match their expectations, making the change of default problematic,
especially since there was no notice printed when directory rename
detection moved files.
Note that there is also a third possibility here:
C) There are different answers depending on the context and content
that cannot be determined by git, so this is a conflict. Use a
higher stage in the index to record the conflict and notify the
user of the potential issue instead of silently selecting a
resolution for them.
Add an option for users to specify their preference for whether to use
directory rename detection, and default to (C). Even when directory
rename detection is on, add notice messages about files moved into new
directories.
As a sidenote, x/d did not have to be a new file here; it could have
already existed at some other path and been renamed to x/d, with
directory rename detection just renaming it again to z/d. Thus, it's
not just new files, but also a modification to all rename types (normal
renames, rename/add, rename/delete, rename/rename(1to1),
rename/rename(1to2), and rename/rename(2to1)).
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
107 lines
4.6 KiB
Plaintext
107 lines
4.6 KiB
Plaintext
merge.conflictStyle::
|
|
Specify the style in which conflicted hunks are written out to
|
|
working tree files upon merge. The default is "merge", which
|
|
shows a `<<<<<<<` conflict marker, changes made by one side,
|
|
a `=======` marker, changes made by the other side, and then
|
|
a `>>>>>>>` marker. An alternate style, "diff3", adds a `|||||||`
|
|
marker and the original text before the `=======` marker.
|
|
|
|
merge.defaultToUpstream::
|
|
If merge is called without any commit argument, merge the upstream
|
|
branches configured for the current branch by using their last
|
|
observed values stored in their remote-tracking branches.
|
|
The values of the `branch.<current branch>.merge` that name the
|
|
branches at the remote named by `branch.<current branch>.remote`
|
|
are consulted, and then they are mapped via `remote.<remote>.fetch`
|
|
to their corresponding remote-tracking branches, and the tips of
|
|
these tracking branches are merged.
|
|
|
|
merge.ff::
|
|
By default, Git does not create an extra merge commit when merging
|
|
a commit that is a descendant of the current commit. Instead, the
|
|
tip of the current branch is fast-forwarded. When set to `false`,
|
|
this variable tells Git to create an extra merge commit in such
|
|
a case (equivalent to giving the `--no-ff` option from the command
|
|
line). When set to `only`, only such fast-forward merges are
|
|
allowed (equivalent to giving the `--ff-only` option from the
|
|
command line).
|
|
|
|
merge.verifySignatures::
|
|
If true, this is equivalent to the --verify-signatures command
|
|
line option. See linkgit:git-merge[1] for details.
|
|
|
|
include::fmt-merge-msg.txt[]
|
|
|
|
merge.renameLimit::
|
|
The number of files to consider when performing rename detection
|
|
during a merge; if not specified, defaults to the value of
|
|
diff.renameLimit. This setting has no effect if rename detection
|
|
is turned off.
|
|
|
|
merge.renames::
|
|
Whether Git detects renames. If set to "false", rename detection
|
|
is disabled. If set to "true", basic rename detection is enabled.
|
|
Defaults to the value of diff.renames.
|
|
|
|
merge.directoryRenames::
|
|
Whether Git detects directory renames, affecting what happens at
|
|
merge time to new files added to a directory on one side of
|
|
history when that directory was renamed on the other side of
|
|
history. If merge.directoryRenames is set to "false", directory
|
|
rename detection is disabled, meaning that such new files will be
|
|
left behind in the old directory. If set to "true", directory
|
|
rename detection is enabled, meaning that such new files will be
|
|
moved into the new directory. If set to "conflict", a conflict
|
|
will be reported for such paths. If merge.renames is false,
|
|
merge.directoryRenames is ignored and treated as false. Defaults
|
|
to "conflict".
|
|
|
|
merge.renormalize::
|
|
Tell Git that canonical representation of files in the
|
|
repository has changed over time (e.g. earlier commits record
|
|
text files with CRLF line endings, but recent ones use LF line
|
|
endings). In such a repository, Git can convert the data
|
|
recorded in commits to a canonical form before performing a
|
|
merge to reduce unnecessary conflicts. For more information,
|
|
see section "Merging branches with differing checkin/checkout
|
|
attributes" in linkgit:gitattributes[5].
|
|
|
|
merge.stat::
|
|
Whether to print the diffstat between ORIG_HEAD and the merge result
|
|
at the end of the merge. True by default.
|
|
|
|
merge.tool::
|
|
Controls which merge tool is used by linkgit:git-mergetool[1].
|
|
The list below shows the valid built-in values.
|
|
Any other value is treated as a custom merge tool and requires
|
|
that a corresponding mergetool.<tool>.cmd variable is defined.
|
|
|
|
merge.guitool::
|
|
Controls which merge tool is used by linkgit:git-mergetool[1] when the
|
|
-g/--gui flag is specified. The list below shows the valid built-in values.
|
|
Any other value is treated as a custom merge tool and requires that a
|
|
corresponding mergetool.<guitool>.cmd variable is defined.
|
|
|
|
include::../mergetools-merge.txt[]
|
|
|
|
merge.verbosity::
|
|
Controls the amount of output shown by the recursive merge
|
|
strategy. Level 0 outputs nothing except a final error
|
|
message if conflicts were detected. Level 1 outputs only
|
|
conflicts, 2 outputs conflicts and file changes. Level 5 and
|
|
above outputs debugging information. The default is level 2.
|
|
Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable.
|
|
|
|
merge.<driver>.name::
|
|
Defines a human-readable name for a custom low-level
|
|
merge driver. See linkgit:gitattributes[5] for details.
|
|
|
|
merge.<driver>.driver::
|
|
Defines the command that implements a custom low-level
|
|
merge driver. See linkgit:gitattributes[5] for details.
|
|
|
|
merge.<driver>.recursive::
|
|
Names a low-level merge driver to be used when
|
|
performing an internal merge between common ancestors.
|
|
See linkgit:gitattributes[5] for details.
|