From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Jan 2013 01:07:04 +0000 (-0800)
Subject: Merge branch 'rt/commit-cleanup-config'
X-Git-Tag: v1.8.2-rc0~111
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/28f04f34636f46f7848be9ce9b36cec6d3554f32?ds=inline;hp=-c

Merge branch 'rt/commit-cleanup-config'

Add a configuration variable to set default clean-up mode other
than "strip".

* rt/commit-cleanup-config:
commit: make default of "cleanup" option configurable
---

28f04f34636f46f7848be9ce9b36cec6d3554f32
diff --combined Documentation/config.txt
index 5ecb0fccb1,8f0ce9eae4..b87f744643
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -923,6 -923,15 +923,15 @@@ column.tag:
  	Specify whether to output tag listing in `git tag` in columns.
  	See `column.ui` for details.
  
+ commit.cleanup::
+ 	This setting overrides the default of the `--cleanup` option in
+ 	`git commit`. See linkgit:git-commit[1] for details. Changing the
+ 	default can be useful when you always want to keep lines that begin
+ 	with comment character `#` in your log message, in which case you
+ 	would do `git config commit.cleanup whitespace` (note that you will
+ 	have to remove the help lines that begin with `#` in the commit log
+ 	template yourself, if you do this).
+ 
  commit.status::
  	A boolean to enable/disable inclusion of status information in the
  	commit message template when using an editor to prepare the commit
@@@ -1361,12 -1370,6 +1370,12 @@@ help.autocorrect:
  	value is 0 - the command will be just shown but not executed.
  	This is the default.
  
 +help.htmlpath::
 +	Specify the path where the HTML documentation resides. File system paths
 +	and URLs are supported. HTML pages will be prefixed with this path when
 +	help is displayed in the 'web' format. This defaults to the documentation
 +	path of your Git installation.
 +
  http.proxy::
  	Override the HTTP proxy, normally configured using the 'http_proxy',
  	'https_proxy', and 'all_proxy' environment variables (see
@@@ -1525,10 -1528,6 +1534,10 @@@ log.showroot:
  	Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which
  	normally hide the root commit will now show it. True by default.
  
 +log.mailmap::
 +	If true, makes linkgit:git-log[1], linkgit:git-show[1], and
 +	linkgit:git-whatchanged[1] assume `--use-mailmap`.
 +
  mailmap.file::
  	The location of an augmenting mailmap file. The default
  	mailmap, located in the root of the repository, is loaded