From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 8 Mar 2008 06:33:26 +0000 (-0800)
Subject: Merge branch 'dc/format-pretty'
X-Git-Tag: v1.5.5-rc0~57
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5628a7a309e11c413138291b215a8cecedaddd24?ds=inline;hp=-c

Merge branch 'dc/format-pretty'

* dc/format-pretty:
log/show/whatchanged: introduce format.pretty configuration
specify explicit "--pretty=medium" with `git log/show/whatchanged`
whatchanged documentation: share description of --pretty with others
---

5628a7a309e11c413138291b215a8cecedaddd24
diff --combined Documentation/config.txt
index 29bc51603f,8a0dff9f49..683a53a0be
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -556,6 -556,11 +556,11 @@@ format.suffix:
  	`.patch`. Use this variable to change that suffix (make sure to
  	include the dot if you want it).
  
+ format.pretty::
+ 	The default pretty format for log/show/whatchanged command,
+ 	See linkgit:git-log[1], linkgit:git-show[1],
+ 	linkgit:git-whatchanged[1].
+ 
  gc.aggressiveWindow::
  	The window size parameter used in the delta compression
  	algorithm used by 'git gc --aggressive'.  This defaults
@@@ -749,10 -754,8 +754,10 @@@ merge.summary:
  
  merge.tool::
  	Controls which merge resolution program is used by
 -	linkgit:git-mergetool[1].  Valid values are: "kdiff3", "tkdiff",
 -	"meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff".
 +	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
@@@ -779,31 -782,6 +784,31 @@@ mergetool.<tool>.path:
  	Override the path for the given tool.  This is useful in case
  	your tool is not in the PATH.
  
 +mergetool.<tool>.cmd::
 +	Specify the command to invoke the specified merge tool.  The
 +	specified command is evaluated in shell with the following
 +	variables available: 'BASE' is the name of a temporary file
 +	containing the common base of the files to be merged, if available;
 +	'LOCAL' is the name of a temporary file containing the contents of
 +	the file on the current branch; 'REMOTE' is the name of a temporary
 +	file containing the contents of the file from the branch being
 +	merged; 'MERGED' contains the name of the file to which the merge
 +	tool should write the results of a successful merge.
 +
 +mergetool.<tool>.trustExitCode::
 +	For a custom merge command, specify whether the exit code of
 +	the merge command can be used to determine whether the merge was
 +	successful.  If this is not set to true then the merge target file
 +	timestamp is checked and the merge assumed to have been successful
 +	if the file has been updated, otherwise the user is prompted to
 +	indicate the success of the merge.
 +
 +mergetool.keepBackup::
 +	After performing a merge, the original file with conflict markers
 +	can be saved as a file with a `.orig` extension.  If this variable
 +	is set to `false` then this file is not preserved.  Defaults to
 +	`true` (i.e. keep the backup files).
 +
  pack.window::
  	The size of the window used by linkgit:git-pack-objects[1] when no
  	window size is given on the command line. Defaults to 10.