diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-09 03:06:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-09 03:06:36 (GMT) |
| commit | ca1c9913f8ac0ccaf976d44822076e1bba5bcd94 (patch) | |
| tree | aa320cfc93864826fd28f0a84bac76d9f12a2d5e /Documentation/config.txt | |
| parent | 31a3c6bb45aa61e45f1663871620eaf742f0abbb (diff) | |
| parent | efb779f8873e5aa36be29a4e551186c62c1b580c (diff) | |
| download | git-ca1c9913f8ac0ccaf976d44822076e1bba5bcd94.zip git-ca1c9913f8ac0ccaf976d44822076e1bba5bcd94.tar.gz git-ca1c9913f8ac0ccaf976d44822076e1bba5bcd94.tar.bz2 | |
Merge branch 'sg/merge-options' (early part)
* 'sg/merge-options' (early part):
merge, pull: add '--(no-)log' command line option
fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
add 'merge.stat' config variable
merge, pull: introduce '--(no-)stat' option
doc: moved merge.* config variables into separate merge-config.txt
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 7a91ac1..a102729 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -809,37 +809,7 @@ man.viewer:: Specify the programs that may be used to display help in the 'man' format. See linkgit:git-help[1]. -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. +include::merge-config.txt[] man.<tool>.cmd:: Specify the command to invoke the specified man viewer. The |