You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
32 lines
1.3 KiB
32 lines
1.3 KiB
17 years ago
|
merge.summary::
|
||
|
|
Whether to include summaries of merged commits in newly created
|
||
|
|
merge commit messages. False 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", and
|
||
|
|
"opendiff". Any other value is treated is custom merge tool
|
||
|
|
and there must be a corresponing 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 '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.
|