From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 May 2008 03:06:36 +0000 (-0700)
Subject: Merge branch 'sg/merge-options' (early part)
X-Git-Tag: v1.5.6-rc0~79
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ca1c9913f8ac0ccaf976d44822076e1bba5bcd94;p=git.git

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
---

ca1c9913f8ac0ccaf976d44822076e1bba5bcd94
diff --cc Documentation/config.txt
index 7a91ac16f,bef612705..a102729fa
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -809,47 -768,8 +809,17 @@@ 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
 +	specified command is evaluated in shell with the man page
 +	passed as argument. (See linkgit:git-help[1].)
 +
 +man.<tool>.path::
 +	Override the path for the given tool that may be used to
 +	display help in the 'man' format. See linkgit:git-help[1].
 +
  mergetool.<tool>.path::
  	Override the path for the given tool.  This is useful in case
  	your tool is not in the PATH.