From: Junio C Hamano Date: Mon, 20 Mar 2017 20:56:09 +0000 (-0700) Subject: Sync with 2.12.1 X-Git-Tag: v2.13.0-rc0~96 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c0f9c705890ac30871c70219c4b08d740fb40e2e?ds=inline;hp=-c Sync with 2.12.1 --- c0f9c705890ac30871c70219c4b08d740fb40e2e diff --combined Documentation/git.txt index df0941d456,25560f69ff..3f75af872c --- a/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.0/git.html[documentation for release 2.12.0] + * link:v2.12.1/git.html[documentation for release 2.12.1] * release notes for + link:RelNotes/2.12.1.txt[2.12.1]. link:RelNotes/2.12.0.txt[2.12]. * link:v2.11.1/git.html[documentation for release 2.11.1] @@@ -1025,12 -1026,6 +1026,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)