[thirdparty/git.git] / Documentation / merge-config.txt

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).

include::fmt-merge-msg-config.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.

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.

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.
Commit	Line	Data
	1	merge.conflictStyle::
	2	Specify the style in which conflicted hunks are written out to
	3	working tree files upon merge. The default is "merge", which
	4	shows a `<<<<<<<` conflict marker, changes made by one side,
	5	a `=======` marker, changes made by the other side, and then
	6	a `>>>>>>>` marker. An alternate style, "diff3", adds a `\|\|\|\|\|\|\|`
	7	marker and the original text before the `=======` marker.
	8
	9	merge.defaultToUpstream::
	10	If merge is called without any commit argument, merge the upstream
	11	branches configured for the current branch by using their last
	12	observed values stored in their remote-tracking branches.
	13	The values of the `branch.<current branch>.merge` that name the
	14	branches at the remote named by `branch.<current branch>.remote`
	15	are consulted, and then they are mapped via `remote.<remote>.fetch`
	16	to their corresponding remote-tracking branches, and the tips of
	17	these tracking branches are merged.
	18
	19	merge.ff::
	20	By default, Git does not create an extra merge commit when merging
	21	a commit that is a descendant of the current commit. Instead, the
	22	tip of the current branch is fast-forwarded. When set to `false`,
	23	this variable tells Git to create an extra merge commit in such
	24	a case (equivalent to giving the `--no-ff` option from the command
	25	line). When set to `only`, only such fast-forward merges are
	26	allowed (equivalent to giving the `--ff-only` option from the
	27	command line).
	28
	29	include::fmt-merge-msg-config.txt[]
	30
	31	merge.renameLimit::
	32	The number of files to consider when performing rename detection
	33	during a merge; if not specified, defaults to the value of
	34	diff.renameLimit.
	35
	36	merge.renormalize::
	37	Tell Git that canonical representation of files in the
	38	repository has changed over time (e.g. earlier commits record
	39	text files with CRLF line endings, but recent ones use LF line
	40	endings). In such a repository, Git can convert the data
	41	recorded in commits to a canonical form before performing a
	42	merge to reduce unnecessary conflicts. For more information,
	43	see section "Merging branches with differing checkin/checkout
	44	attributes" in linkgit:gitattributes[5].
	45
	46	merge.stat::
	47	Whether to print the diffstat between ORIG_HEAD and the merge result
	48	at the end of the merge. True by default.
	49
	50	merge.tool::
	51	Controls which merge tool is used by linkgit:git-mergetool[1].
	52	The list below shows the valid built-in values.
	53	Any other value is treated as a custom merge tool and requires
	54	that a corresponding mergetool.<tool>.cmd variable is defined.
	55
	56	include::mergetools-merge.txt[]
	57
	58	merge.verbosity::
	59	Controls the amount of output shown by the recursive merge
	60	strategy. Level 0 outputs nothing except a final error
	61	message if conflicts were detected. Level 1 outputs only
	62	conflicts, 2 outputs conflicts and file changes. Level 5 and
	63	above outputs debugging information. The default is level 2.
	64	Can be overridden by the 'GIT_MERGE_VERBOSITY' environment variable.
	65
	66	merge.<driver>.name::
	67	Defines a human-readable name for a custom low-level
	68	merge driver. See linkgit:gitattributes[5] for details.
	69
	70	merge.<driver>.driver::
	71	Defines the command that implements a custom low-level
	72	merge driver. See linkgit:gitattributes[5] for details.
	73
	74	merge.<driver>.recursive::
	75	Names a low-level merge driver to be used when
	76	performing an internal merge between common ancestors.
	77	See linkgit:gitattributes[5] for details.