From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Mar 2018 22:00:46 +0000 (-0700)
Subject: Merge branch 'ab/man-sec-list'
X-Git-Tag: v2.17.0-rc0~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a8ba07c68a22d2740879c862d1ec57592fb2e15a?hp=-c

Merge branch 'ab/man-sec-list'

Doc update.

* ab/man-sec-list:
git manpage: note git-security@googlegroups.com
---

a8ba07c68a22d2740879c862d1ec57592fb2e15a
diff --combined Documentation/git.txt
index 8163b5796b,4881688b39..4767860e72
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -646,16 -646,6 +646,16 @@@ of clones and fetches
  	variable.
  	See `GIT_TRACE` for available trace output options.
  
 +`GIT_TRACE_CURL_NO_DATA`::
 +	When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump
 +	data (that is, only dump info lines and headers).
 +
 +`GIT_REDACT_COOKIES`::
 +	This can be set to a comma-separated list of strings. When a curl trace
 +	is enabled (see `GIT_TRACE_CURL` above), whenever a "Cookies:" header
 +	sent by the client is dumped, values of cookies whose key is in that
 +	list (case-sensitive) are redacted.
 +
  `GIT_LITERAL_PATHSPECS`::
  	Setting this variable to `1` will cause Git to treat all
  	pathspecs literally, rather than as glob patterns. For example,
@@@ -849,6 -839,9 +849,9 @@@ Report bugs to the Git mailing list <gi
  development and maintenance is primarily done.  You do not have to be
  subscribed to the list to send a message there.
  
+ Issues which are security relevant should be disclosed privately to
+ the Git Security mailing list <git-security@googlegroups.com>.
+ 
  SEE ALSO
  --------
  linkgit:gittutorial[7], linkgit:gittutorial-2[7],