Sync with 2.12.2

diff --combined .mailmap
index e06526a49300eb78e5cac3504902d6a3b1053324,c44cf67a482567fd640223f777f10bc95acd5b85..ab85e0d16d6383b13954220a0b41202bd68d5d73
--- 1/.mailmap
--- 2/.mailmap
+++ b/.mailmap
@@@ -151,7 -151,8 +151,8 @@@ Matthias Kestenholz <matthias@spinlock.
  Matthias Urlichs <matthias@urlichs.de> <smurf@kiste.(none)>
  Matthias Urlichs <matthias@urlichs.de> <smurf@smurf.noris.de>
  Michael Coleman <tutufan@gmail.com>
- Michael J Gruber <git@drmicha.warpmail.net> <michaeljgruber+gmane@fastmail.fm>
+ Michael J Gruber <git@grubix.eu> <michaeljgruber+gmane@fastmail.fm>
+ Michael J Gruber <git@grubix.eu> <git@drmicha.warpmail.net>
  Michael S. Tsirkin <mst@kernel.org> <mst@redhat.com>
  Michael S. Tsirkin <mst@kernel.org> <mst@mellanox.co.il>
  Michael S. Tsirkin <mst@kernel.org> <mst@dev.mellanox.co.il>
@@@ -177,7 -178,6 +178,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>

diff --combined Documentation/git.txt
index 3f75af872c040ade3bebdf8ae196e158f0688141,88c39d3ed5d5239ffd485711d01d51e546dedde6..ecc1bb4bd7c3e6adc82c9955817b532bedadc453
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -44,9 -44,10 +44,10 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v2.12.1/git.html[documentation for release 2.12.1]
+ * link:v2.12.2/git.html[documentation for release 2.12.2]
  
  * release notes for
+   link:RelNotes/2.12.2.txt[2.12.2].
    link:RelNotes/2.12.1.txt[2.12.1].
    link:RelNotes/2.12.0.txt[2.12].
  
@@@ -1026,12 -1027,6 +1027,12 @@@ Usually it is easier to configure any d
  personal `.ssh/config` file.  Please consult your ssh documentation
  for further details.
  
 +`GIT_SSH_VARIANT`::
 +      If this environment variable is set, it overrides Git's autodetection
 +      whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH,
 +      plink or tortoiseplink. This variable overrides the config setting
 +      `ssh.variant` that serves the same purpose.
 +
  `GIT_ASKPASS`::
        If this environment variable is set, then Git commands which need to
        acquire passwords or passphrases (e.g. for HTTP or IMAP authentication)