2 Whether to include summaries of merged commits in newly created
3 merge commit messages. False by default.
6 Controls which merge resolution program is used by
7 linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",
8 "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and
9 "opendiff". Any other value is treated is custom merge tool
10 and there must be a corresponing mergetool.<tool>.cmd option.
13 Controls the amount of output shown by the recursive merge
14 strategy. Level 0 outputs nothing except a final error
15 message if conflicts were detected. Level 1 outputs only
16 conflicts, 2 outputs conflicts and file changes. Level 5 and
17 above outputs debugging information. The default is level 2.
18 Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable.
21 Defines a human readable name for a custom low-level
22 merge driver. See linkgit:gitattributes[5] for details.
24 merge.<driver>.driver::
25 Defines the command that implements a custom low-level
26 merge driver. See linkgit:gitattributes[5] for details.
28 merge.<driver>.recursive::
29 Names a low-level merge driver to be used when
30 performing an internal merge between common ancestors.
31 See linkgit:gitattributes[5] for details.