From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Apr 2013 20:31:24 +0000 (-0700)
Subject: Merge branch 'fc/branch-upstream-color'
X-Git-Tag: v1.8.3-rc0~47
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4059da335240ab35da6ee9d6f73346eba28fdfc7?ds=inline;hp=-c

Merge branch 'fc/branch-upstream-color'

Add more colors to "git branch -vv" output.

* fc/branch-upstream-color:
branch: colour upstream branches
---

4059da335240ab35da6ee9d6f73346eba28fdfc7
diff --combined Documentation/config.txt
index 21d4447cb4,426d02c9a0..29559c88af
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -807,7 -807,8 +807,8 @@@ color.branch:
  color.branch.<slot>::
  	Use customized color for branch coloration. `<slot>` is one of
  	`current` (the current branch), `local` (a local branch),
- 	`remote` (a remote-tracking branch in refs/remotes/), `plain` (other
+ 	`remote` (a remote-tracking branch in refs/remotes/),
+ 	`upstream` (upstream tracking branch), `plain` (other
  	refs).
  +
  The value for these configuration variables is a list of colors (at most
@@@ -1109,11 -1110,6 +1110,11 @@@ format.signoff:
      the rights to submit this work under the same open source license.
      Please see the 'SubmittingPatches' document for further discussion.
  
 +format.coverLetter::
 +	A boolean that controls whether to generate a cover-letter when
 +	format-patch is invoked, but in addition can be set to "auto", to
 +	generate a cover-letter only when there's more than one patch.
 +
  filter.<driver>.clean::
  	The command which is used to convert the content of a worktree
  	file to a blob upon checkin.  See linkgit:gitattributes[5] for
@@@ -1465,14 -1461,6 +1466,14 @@@ http.sslCAPath:
  	with when fetching or pushing over HTTPS. Can be overridden
  	by the 'GIT_SSL_CAPATH' environment variable.
  
 +http.sslTry::
 +	Attempt to use AUTH SSL/TLS and encrypted data transfers
 +	when connecting via regular FTP protocol. This might be needed
 +	if the FTP server requires it for security reasons or you wish
 +	to connect securely whenever remote FTP server supports it.
 +	Default is false since it might trigger certificate verification
 +	errors on misconfigured servers.
 +
  http.maxRequests::
  	How many HTTP requests to launch in parallel. Can be overridden
  	by the 'GIT_HTTP_MAX_REQUESTS' environment variable. Default is 5.
@@@ -2029,7 -2017,6 +2030,7 @@@ sendemail.<identity>.*:
  
  sendemail.aliasesfile::
  sendemail.aliasfiletype::
 +sendemail.annotate::
  sendemail.bcc::
  sendemail.cc::
  sendemail.cccmd::