From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Oct 2009 01:40:20 +0000 (-0700)
Subject: Merge branch 'jc/receive-pack-auto'
X-Git-Tag: v1.6.6-rc0~102
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/aa06b4d3f43be3879556361768a07934f23ac230?ds=inline;hp=-c

Merge branch 'jc/receive-pack-auto'

* jc/receive-pack-auto:
receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
gc --auto --quiet: make the notice a bit less verboase
---

aa06b4d3f43be3879556361768a07934f23ac230
diff --combined Documentation/config.txt
index 5a8f57cbf7,ba6ed1080f..d1e2120e15
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -416,17 -416,13 +416,17 @@@ core.whitespace:
  	consider them as errors.  You can prefix `-` to disable
  	any of them (e.g. `-trailing-space`):
  +
 -* `trailing-space` treats trailing whitespaces at the end of the line
 +* `blank-at-eol` treats trailing whitespaces at the end of the line
    as an error (enabled by default).
  * `space-before-tab` treats a space character that appears immediately
    before a tab character in the initial indent part of the line as an
    error (enabled by default).
  * `indent-with-non-tab` treats a line that is indented with 8 or more
    space characters as an error (not enabled by default).
 +* `blank-at-eof` treats blank lines added at the end of file as an error
 +  (enabled by default).
 +* `trailing-space` is a short-hand to cover both `blank-at-eol` and
 +  `blank-at-eof`.
  * `cr-at-eol` treats a carriage-return at the end of line as
    part of the line terminator, i.e. with it, `trailing-space`
    does not trigger if the character before such a carriage-return
@@@ -1324,6 -1320,11 +1324,11 @@@ rebase.stat:
  	Whether to show a diffstat of what changed upstream since the last
  	rebase. False by default.
  
+ receive.autogc::
+ 	By default, git-receive-pack will run "git-gc --auto" after
+ 	receiving data from git-push and updating refs.  You can stop
+ 	it by setting this variable to false.
+ 
  receive.fsckObjects::
  	If it is set to true, git-receive-pack will check all received
  	objects. It will abort in the case of a malformed object or a
@@@ -1359,6 -1360,10 +1364,10 @@@ receive.denyNonFastForwards:
  	even if that push is forced. This configuration variable is
  	set when initializing a shared repository.
  
+ receive.updateserverinfo::
+ 	If set to true, git-receive-pack will run git-update-server-info
+ 	after receiving data from git-push and updating refs.
+ 
  remote.<name>.url::
  	The URL of a remote repository.  See linkgit:git-fetch[1] or
  	linkgit:git-push[1].