From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Oct 2011 19:36:24 +0000 (-0700)
Subject: Merge branch 'tr/doc-note-rewrite'
X-Git-Tag: v1.7.8-rc0~128
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b5b6521645ed41353e88c443ebaf124b214f25b1?ds=inline;hp=-c

Merge branch 'tr/doc-note-rewrite'

* tr/doc-note-rewrite:
Documentation: basic configuration of notes.rewriteRef
---

b5b6521645ed41353e88c443ebaf124b214f25b1
diff --combined Documentation/config.txt
index 98bac55073,cc39f8639a..9ec2ae2de7
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -678,7 -678,7 +678,7 @@@ branch.<name>.rebase:
  browser.<tool>.cmd::
  	Specify the command to invoke the specified browser. The
  	specified command is evaluated in shell with the URLs passed
 -	as arguments. (See linkgit:git-web--browse[1].)
 +	as arguments. (See linkgit:git-web{litdd}browse[1].)
  
  browser.<tool>.path::
  	Override the path for the given tool that may be used to
@@@ -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
@@@ -1205,14 -1198,6 +1205,14 @@@ http.proxy:
  	environment variable (see linkgit:curl[1]).  This can be overridden
  	on a per-remote basis; see remote.<name>.proxy
  
 +http.cookiefile::
 +	File containing previously stored cookie lines which should be used
 +	in the git http session, if they match the server. The file format
 +	of the file to read cookies from should be plain HTTP headers or
 +	the Netscape/Mozilla cookie file format (see linkgit:curl[1]).
 +	NOTE that the file specified with http.cookiefile is only used as
 +	input. No cookies will be stored in the file.
 +
  http.sslVerify::
  	Whether to verify the SSL certificate when fetching or pushing
  	over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment
@@@ -1460,7 -1445,8 +1460,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
@@@ -1602,8 -1588,7 +1603,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
@@@ -1838,11 -1823,6 +1839,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.