[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.log::
	Whether to include summaries of merged commits in newly created
	merge commit messages. False by default.

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 resolution program is used by
	linkgit:git-mergetool[1].  Valid built-in values are: "kdiff3",
	"tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff",
	"diffuse", "ecmerge", "tortoisemerge", "p4merge", "araxis" and
	"opendiff".  Any other value is treated is custom merge tool
	and there must be a corresponding mergetool.<tool>.cmd option.

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
42fc11c1 JH	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
29b802aa RW	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.
3e6c0a3f	8
6cd9cfef	9	merge.log::
f5a84c37 SG	10	Whether to include summaries of merged commits in newly created
	11	merge commit messages. False by default.
	12
2a2ac926 JK	13	merge.renameLimit::
	14	The number of files to consider when performing rename detection
	15	during a merge; if not specified, defaults to the value of
	16	diff.renameLimit.
	17
f217f0e8 EB	18	merge.renormalize::
	19	Tell git that canonical representation of files in the
	20	repository has changed over time (e.g. earlier commits record
	21	text files with CRLF line endings, but recent ones use LF line
	22	endings). In such a repository, git can convert the data
	23	recorded in commits to a canonical form before performing a
	24	merge to reduce unnecessary conflicts. For more information,
	25	see section "Merging branches with differing checkin/checkout
	26	attributes" in linkgit:gitattributes[5].
	27
42fc11c1 JH	28	merge.stat::
	29	Whether to print the diffstat between ORIG_HEAD and the merge result
	30	at the end of the merge. True by default.
	31
f5a84c37 SG	32	merge.tool::
	33	Controls which merge resolution program is used by
	34	linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",
da81688c	35	"tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff",
c8998b48	36	"diffuse", "ecmerge", "tortoisemerge", "p4merge", "araxis" and
f5a84c37	37	"opendiff". Any other value is treated is custom merge tool
1168d402	38	and there must be a corresponding mergetool.<tool>.cmd option.
f5a84c37 SG	39
	40	merge.verbosity::
	41	Controls the amount of output shown by the recursive merge
	42	strategy. Level 0 outputs nothing except a final error
	43	message if conflicts were detected. Level 1 outputs only
	44	conflicts, 2 outputs conflicts and file changes. Level 5 and
	45	above outputs debugging information. The default is level 2.
29b802aa	46	Can be overridden by the 'GIT_MERGE_VERBOSITY' environment variable.
f5a84c37 SG	47
f5a84c37 SG	48	merge.<driver>.name::
29b802aa	49	Defines a human-readable name for a custom low-level
f5a84c37 SG	50	merge driver. See linkgit:gitattributes[5] for details.
	51
	52	merge.<driver>.driver::
	53	Defines the command that implements a custom low-level
	54	merge driver. See linkgit:gitattributes[5] for details.
	55
	56	merge.<driver>.recursive::
	57	Names a low-level merge driver to be used when
	58	performing an internal merge between common ancestors.
	59	See linkgit:gitattributes[5] for details.