From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Feb 2017 21:57:12 +0000 (-0800)
Subject: Merge branch 'ps/urlmatch-wildcard'
X-Git-Tag: v2.13.0-rc0~175
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a411726930a6fc97d5a1f62d8d8d59b8587b10f2?ds=inline;hp=-c

Merge branch 'ps/urlmatch-wildcard'

The <url> part in "http.<url>.<variable>" configuration variable
can now be spelled with '*' that serves as wildcard.
E.g. "http.https://*.example.com.proxy" can be used to specify the
proxy used for https://a.example.com, https://b.example.com, etc.,
i.e. any host in the example.com domain.

* ps/urlmatch-wildcard:
urlmatch: allow globbing for the URL host part
urlmatch: include host in urlmatch ranking
urlmatch: split host and port fields in `struct url_info`
urlmatch: enable normalization of URLs with globs
mailmap: add Patrick Steinhardt's work address
---

a411726930a6fc97d5a1f62d8d8d59b8587b10f2
diff --combined .mailmap
index ab59b2fac6,ea59205b92..e06526a493
--- a/.mailmap
+++ b/.mailmap
@@@ -177,6 -177,7 +177,7 @@@ Paolo Bonzini <bonzini@gnu.org> <paolo.
  Pascal Obry <pascal@obry.net> <pascal.obry@gmail.com>
  Pascal Obry <pascal@obry.net> <pascal.obry@wanadoo.fr>
  Pat Notz <patnotz@gmail.com> <pknotz@sandia.gov>
+ Patrick Steinhardt <ps@pks.im> <patrick.steinhardt@elego.de>
  Paul Mackerras <paulus@samba.org> <paulus@dorrigo.(none)>
  Paul Mackerras <paulus@samba.org> <paulus@pogo.(none)>
  Peter Baumann <waste.manager@gmx.de> <Peter.B.Baumann@stud.informatik.uni-erlangen.de>
@@@ -225,7 -226,6 +226,7 @@@ Steven Walter <stevenrwalter@gmail.com
  Steven Walter <stevenrwalter@gmail.com> <swalter@lpdev.prtdev.lexmark.com>
  Sven Verdoolaege <skimo@kotnet.org> <Sven.Verdoolaege@cs.kuleuven.ac.be>
  Sven Verdoolaege <skimo@kotnet.org> <skimo@liacs.nl>
 +SZEDER Gábor <szeder.dev@gmail.com> <szeder@ira.uka.de>
  Tay Ray Chuan <rctay89@gmail.com>
  Ted Percival <ted@midg3t.net> <ted.percival@quest.com>
  Theodore Ts'o <tytso@mit.edu>
diff --combined Documentation/config.txt
index 015346c417,ee155d8a6b..10351a2100
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -170,9 -170,6 +170,9 @@@ The position of any attributes with res
  be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`,
  `no-ul`, etc).
  +
 +An empty color string produces no color effect at all. This can be used
 +to avoid coloring specific elements without disabling color entirely.
 ++
  For git's pre-defined color slots, the attributes are meant to be reset
  at the beginning of each item in the colored output. So setting
  `color.decorate.branch` to `black` will paint that branch name in a
@@@ -520,12 -517,10 +520,12 @@@ core.logAllRefUpdates:
  	"`$GIT_DIR/logs/<ref>`", by appending the new and old
  	SHA-1, the date/time and the reason of the update, but
  	only when the file exists.  If this configuration
 -	variable is set to true, missing "`$GIT_DIR/logs/<ref>`"
 +	variable is set to `true`, missing "`$GIT_DIR/logs/<ref>`"
  	file is automatically created for branch heads (i.e. under
 -	refs/heads/), remote refs (i.e. under refs/remotes/),
 -	note refs (i.e. under refs/notes/), and the symbolic ref HEAD.
 +	`refs/heads/`), remote refs (i.e. under `refs/remotes/`),
 +	note refs (i.e. under `refs/notes/`), and the symbolic ref `HEAD`.
 +	If it is set to `always`, then a missing reflog is automatically
 +	created for any ref under `refs/`.
  +
  This information can be used to determine what commit
  was the tip of a branch "2 days ago".
@@@ -1919,7 -1914,10 +1919,10 @@@ http.<url>.*:
    must match exactly between the config key and the URL.
  
  . Host/domain name (e.g., `example.com` in `https://example.com/`).
-   This field must match exactly between the config key and the URL.
+   This field must match between the config key and the URL. It is
+   possible to specify a `*` as part of the host name to match all subdomains
+   at this level. `https://*.example.com/` for example would match
+   `https://foo.example.com/`, but not `https://foo.bar.example.com/`.
  
  . Port number (e.g., `8080` in `http://example.com:8080/`).
    This field must match exactly between the config key and the URL.
@@@ -2041,10 -2039,6 +2044,10 @@@ log.follow:
  	i.e. it cannot be used to follow multiple files and does not work well
  	on non-linear history.
  
 +log.graphColors::
 +	A list of colors, separated by commas, that can be used to draw
 +	history lines in `git log --graph`.
 +
  log.showRoot::
  	If true, the initial commit will be shown as a big creation event.
  	This is equivalent to a diff against an empty tree.
@@@ -2949,7 -2943,7 +2952,7 @@@ submodule.alternateLocation:
  	value is set to `superproject` the submodule to be cloned computes
  	its alternates location relative to the superprojects alternate.
  
 -submodule.alternateErrorStrategy
 +submodule.alternateErrorStrategy::
  	Specifies how to treat errors with the alternates for a submodule
  	as computed via `submodule.alternateLocation`. Possible values are
  	`ignore`, `info`, `die`. Default is `die`.