1merge.stat:: 2 Whether to print the diffstat between ORIG_HEAD and the merge result 3 at the end of the merge. True by default. 4 5merge.log:: 6 Whether to include summaries of merged commits in newly created 7 merge commit messages. False by default. 8 9merge.renameLimit:: 10 The number of files to consider when performing rename detection 11 during a merge; if not specified, defaults to the value of 12 diff.renameLimit. 13 14merge.tool:: 15 Controls which merge resolution program is used by 16 linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3", 17 "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and 18 "opendiff". Any other value is treated is custom merge tool 19 and there must be a corresponding mergetool.<tool>.cmd option. 20 21merge.verbosity:: 22 Controls the amount of output shown by the recursive merge 23 strategy. Level 0 outputs nothing except a final error 24 message if conflicts were detected. Level 1 outputs only 25 conflicts, 2 outputs conflicts and file changes. Level 5 and 26 above outputs debugging information. The default is level 2. 27 Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable. 28 29merge.<driver>.name:: 30 Defines a human readable name for a custom low-level 31 merge driver. See linkgit:gitattributes[5] for details. 32 33merge.<driver>.driver:: 34 Defines the command that implements a custom low-level 35 merge driver. See linkgit:gitattributes[5] for details. 36 37merge.<driver>.recursive:: 38 Names a low-level merge driver to be used when 39 performing an internal merge between common ancestors. 40 See linkgit:gitattributes[5] for details.