From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Sep 2013 21:32:08 +0000 (-0700)
Subject: Merge branch 'db/http-savecookies'
X-Git-Tag: v1.8.5-rc0~170
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/43012626401421c19e3fd211c27672890986f6b9?hp=-c

Merge branch 'db/http-savecookies'

* db/http-savecookies:
t5551: Remove header from curl cookie file
http: add http.savecookies option to write out HTTP cookies
---

43012626401421c19e3fd211c27672890986f6b9
diff --combined Documentation/config.txt
index 4a51e6a68d,e935447d94..e8eadde305
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -213,6 -213,17 +213,6 @@@ The default is true, except linkgit:git
  will probe and set core.fileMode false if appropriate when the
  repository is created.
  
 -core.ignoreCygwinFSTricks::
 -	This option is only used by Cygwin implementation of Git. If false,
 -	the Cygwin stat() and lstat() functions are used. This may be useful
 -	if your repository consists of a few separate directories joined in
 -	one hierarchy using Cygwin mount. If true, Git uses native Win32 API
 -	whenever it is possible and falls back to Cygwin functions only to
 -	handle symbol links. The native mode is more than twice faster than
 -	normal Cygwin l/stat() functions. True by default, unless core.filemode
 -	is true, in which case ignoreCygwinFSTricks is ignored as Cygwin's
 -	POSIX emulation is required to support core.filemode.
 -
  core.ignorecase::
  	If true, this option enables various workarounds to enable
  	Git to work better on filesystems that are not case sensitive,
@@@ -1061,10 -1072,6 +1061,10 @@@ fetch.unpackLimit:
  	especially on slow filesystems.  If not set, the value of
  	`transfer.unpackLimit` is used instead.
  
 +fetch.prune::
 +	If true, fetch will automatically behave as if the `--prune`
 +	option was given on the command line.  See also `remote.<name>.prune`.
 +
  format.attach::
  	Enable multipart/mixed attachments as the default for
  	'format-patch'.  The value can also be a double quoted string
@@@ -1449,7 -1456,11 +1449,11 @@@ http.cookiefile:
  	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.
+ 	input unless http.saveCookies is set.
+ 
+ http.savecookies::
+ 	If set, store cookies received during requests to the file specified by
+ 	http.cookiefile. Has no effect if http.cookiefile is unset.
  
  http.sslVerify::
  	Whether to verify the SSL certificate when fetching or pushing
@@@ -2028,12 -2039,6 +2032,12 @@@ remote.<name>.vcs:
  	Setting this to a value <vcs> will cause Git to interact with
  	the remote with the git-remote-<vcs> helper.
  
 +remote.<name>.prune::
 +	When set to true, fetching from this remote by default will also
 +	remove any remote-tracking branches which no longer exist on the
 +	remote (as if the `--prune` option was give on the command line).
 +	Overrides `fetch.prune` settings, if any.
 +
  remotes.<group>::
  	The list of remotes which are fetched by "git remote update
  	<group>".  See linkgit:git-remote[1].