Improve language in git-merge.txt and related docs
[git/git.git] / Documentation / merge-config.txt
CommitLineData
42fc11c1
JH
1merge.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 9merge.log::
f5a84c37
SG
10 Whether to include summaries of merged commits in newly created
11 merge commit messages. False by default.
12
2a2ac926
JK
13merge.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
42fc11c1
JH
18merge.stat::
19 Whether to print the diffstat between ORIG_HEAD and the merge result
20 at the end of the merge. True by default.
21
f5a84c37
SG
22merge.tool::
23 Controls which merge resolution program is used by
24 linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",
25 "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and
26 "opendiff". Any other value is treated is custom merge tool
1168d402 27 and there must be a corresponding mergetool.<tool>.cmd option.
f5a84c37
SG
28
29merge.verbosity::
30 Controls the amount of output shown by the recursive merge
31 strategy. Level 0 outputs nothing except a final error
32 message if conflicts were detected. Level 1 outputs only
33 conflicts, 2 outputs conflicts and file changes. Level 5 and
34 above outputs debugging information. The default is level 2.
29b802aa 35 Can be overridden by the 'GIT_MERGE_VERBOSITY' environment variable.
f5a84c37
SG
36
37merge.<driver>.name::
29b802aa 38 Defines a human-readable name for a custom low-level
f5a84c37
SG
39 merge driver. See linkgit:gitattributes[5] for details.
40
41merge.<driver>.driver::
42 Defines the command that implements a custom low-level
43 merge driver. See linkgit:gitattributes[5] for details.
44
45merge.<driver>.recursive::
46 Names a low-level merge driver to be used when
47 performing an internal merge between common ancestors.
48 See linkgit:gitattributes[5] for details.