From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 Oct 2011 04:59:11 +0000 (-0700)
Subject: Merge branch 'jn/gitweb-manpages'
X-Git-Tag: v1.7.8-rc0~45
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/380f26c29ba8b32c0f4e450c9a6c48e24e0919da?ds=inline;hp=-c

Merge branch 'jn/gitweb-manpages'

* jn/gitweb-manpages:
gitweb: Add gitweb manpages to 'gitweb' package in git.spec
Documentation: Add gitweb config variables to git-config(1)
Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages
gitweb: Add gitweb(1) manpage for gitweb itself
gitweb: Add gitweb.conf(5) manpage for gitweb configuration files
---

380f26c29ba8b32c0f4e450c9a6c48e24e0919da
diff --combined Documentation/config.txt
index 03296b7eb8,36e50526cb..b30c7e6278
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -147,7 -147,7 +147,7 @@@ advice.*:
  
  core.fileMode::
  	If false, the executable bit differences between the index and
 -	the working copy are ignored; useful on broken filesystems like FAT.
 +	the working tree are ignored; useful on broken filesystems like FAT.
  	See linkgit:git-update-index[1].
  +
  The default is true, except linkgit:git-clone[1] or linkgit:git-init[1]
@@@ -179,7 -179,7 +179,7 @@@ is created
  
  core.trustctime::
  	If false, the ctime differences between the index and the
 -	working copy are ignored; useful when the inode change time
 +	working tree are ignored; useful when the inode change time
  	is regularly modified by something outside Git (file system
  	crawlers and some backup systems).
  	See linkgit:git-update-index[1]. True by default.
@@@ -292,7 -292,7 +292,7 @@@ core.ignoreStat:
  	If true, commands which modify both the working tree and the index
  	will mark the updated paths with the "assume unchanged" bit in the
  	index. These marked files are then assumed to stay unchanged in the
 -	working copy, until you	mark them otherwise manually - Git will not
 +	working tree, until you mark them otherwise manually - Git will not
  	detect the file changes	by lstat() calls. This is useful on systems
  	where those are very slow, such as Microsoft Windows.
  	See linkgit:git-update-index[1].
@@@ -857,13 -857,6 +857,13 @@@ fetch.recurseSubmodules:
  	when its superproject retrieves a commit that updates the submodule's
  	reference.
  
 +fetch.fsckObjects::
 +	If it is set to true, git-fetch-pack will check all fetched
 +	objects. It will abort in the case of a malformed object or a
 +	broken link. The result of an abort are only dangling objects.
 +	Defaults to false. If not set, the value of `transfer.fsckObjects`
 +	is used instead.
 +
  fetch.unpackLimit::
  	If the number of objects fetched over the git native
  	transfer is below this
@@@ -1071,6 -1064,23 +1071,23 @@@ All gitcvs variables except for 'gitcvs
  is one of "ext" and "pserver") to make them apply only for the given
  access method.
  
+ gitweb.category::
+ gitweb.description::
+ gitweb.owner::
+ gitweb.url::
+ 	See linkgit:gitweb[1] for description.
+ 
+ gitweb.avatar::
+ gitweb.blame::
+ gitweb.grep::
+ gitweb.highlight::
+ gitweb.patches::
+ gitweb.pickaxe::
+ gitweb.remote_heads::
+ gitweb.showsizes::
+ gitweb.snapshot::
+ 	See linkgit:gitweb.conf[5] for description.
+ 
  grep.lineNumber::
  	If set to true, enable '-n' option by default.
  
@@@ -1460,8 -1470,7 +1477,8 @@@ notes.rewriteRef:
  	You may also specify this configuration several times.
  +
  Does not have a default value; you must configure this variable to
 -enable note rewriting.
 +enable note rewriting.  Set it to `refs/notes/commits` to enable
 +rewriting for the default commit notes.
  +
  This setting can be overridden with the `GIT_NOTES_REWRITE_REF`
  environment variable, which must be a colon separated list of refs or
@@@ -1603,8 -1612,7 +1620,8 @@@ 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
  	broken link. The result of an abort are only dangling objects.
 -	Defaults to false.
 +	Defaults to false. If not set, the value of `transfer.fsckObjects`
 +	is used instead.
  
  receive.unpackLimit::
  	If the number of objects received in a push is below this
@@@ -1839,11 -1847,6 +1856,11 @@@ tar.umask:
  	archiving user's umask will be used instead.  See umask(2) and
  	linkgit:git-archive[1].
  
 +transfer.fsckObjects::
 +	When `fetch.fsckObjects` or `receive.fsckObjects` are
 +	not set, the value of this variable is used instead.
 +	Defaults to false.
 +
  transfer.unpackLimit::
  	When `fetch.unpackLimit` or `receive.unpackLimit` are
  	not set, the value of this variable is used instead.