Documentation/merge-config.txt

   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.log::
  10         Whether to include summaries of merged commits in newly created
  11         merge commit messages. False by default.
  12
  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
  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
  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
  32 merge.tool::
  33         Controls which merge resolution program is used by
  34         linkgit:git-mergetool[1].  Valid built-in values are: "kdiff3",
  35         "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff",
  36         "diffuse", "ecmerge", "tortoisemerge", "p4merge", "araxis" and
  37         "opendiff".  Any other value is treated is custom merge tool
  38         and there must be a corresponding mergetool.<tool>.cmd option.
  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.
  46         Can be overridden by the 'GIT_MERGE_VERBOSITY' environment variable.
  47
  48 merge.<driver>.name::
  49         Defines a human-readable name for a custom low-level
  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.