From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Jul 2011 21:31:37 +0000 (-0700)
Subject: Merge branch 'jn/doc-dashdash'
X-Git-Tag: v1.7.7-rc0~96
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/af52e6b06ad108aa372fcc8432f1c449eeb5a34b?ds=inline;hp=-c

Merge branch 'jn/doc-dashdash'

* jn/doc-dashdash:
Documentation/i18n: quote double-dash for AsciiDoc
Documentation: quote double-dash for AsciiDoc
---

af52e6b06ad108aa372fcc8432f1c449eeb5a34b
diff --combined Documentation/config.txt
index c631d1cbf9,98eb4d9715..b56959b5dc
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -676,7 -676,7 +676,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
@@@ -1196,14 -1196,6 +1196,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