From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Jan 2009 07:09:35 +0000 (-0800)
Subject: Merge branch 'fe/cvsserver'
X-Git-Tag: v1.6.2-rc0~164
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d83fd33bc14512afdd0d5b8e1d0fe46311531e2e?ds=inline;hp=-c

Merge branch 'fe/cvsserver'

* fe/cvsserver:
cvsserver: change generation of CVS author names
cvsserver: add option to configure commit message
---

d83fd33bc14512afdd0d5b8e1d0fe46311531e2e
diff --combined Documentation/config.txt
index ea0cd97b04,b4e0eea9f7..6b3ac5aa90
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -702,9 -702,7 +702,9 @@@ gc.packrefs:
  
  gc.pruneexpire::
  	When 'git-gc' is run, it will call 'prune --expire 2.weeks.ago'.
 -	Override the grace period with this config variable.
 +	Override the grace period with this config variable.  The value
 +	"now" may be used to disable this  grace period and always prune
 +	unreachable objects immediately.
  
  gc.reflogexpire::
  	'git-reflog expire' removes reflog entries older than
@@@ -725,6 -723,10 +725,10 @@@ gc.rerereunresolved:
  	kept for this many days when 'git-rerere gc' is run.
  	The default is 15 days.  See linkgit:git-rerere[1].
  
+ gitcvs.commitmsgannotation::
+ 	Append this string to each commit message. Set to empty string
+ 	to disable this feature. Defaults to "via git-CVS emulator".
+ 
  gitcvs.enabled::
  	Whether the CVS server interface is enabled for this repository.
  	See linkgit:git-cvsserver[1].
@@@ -1046,16 -1048,6 +1050,16 @@@ mergetool.keepBackup:
  	is set to `false` then this file is not preserved.  Defaults to
  	`true` (i.e. keep the backup files).
  
 +mergetool.keepTemporaries::
 +	When invoking a custom merge tool, git uses a set of temporary
 +	files to pass to the tool. If the tool returns an error and this
 +	variable is set to `true`, then these temporary files will be
 +	preserved, otherwise they will be removed after the tool has
 +	exited. Defaults to `false`.
 +
 +mergetool.prompt::
 +	Prompt before each invocation of the merge resolution program.
 +
  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.