Sync with v2.12.3
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 May 2017 03:20:21 +0000 (20:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 May 2017 03:20:21 +0000 (20:20 -0700)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1  2 
Documentation/git.txt
diff --combined Documentation/git.txt
index ecc1bb4bd7c3e6adc82c9955817b532bedadc453,a52b155b4b592b53082da1426e95021586a329d9..e9fc891a7f6e06e221314ad96e44daef6cbf45ef
@@@ -44,54 -44,62 +44,62 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v2.12.2/git.html[documentation for release 2.12.2]
+ * link:v2.12.3/git.html[documentation for release 2.12.3]
  
  * 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.3.txt[2.12.3],
+   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].
  
  * link:v2.11.1/git.html[documentation for release 2.11.1]
  
  * release notes for
+   link:RelNotes/2.11.2.txt[2.11.2],
    link:RelNotes/2.11.1.txt[2.11.1],
    link:RelNotes/2.11.0.txt[2.11].
  
- * link:v2.10.2/git.html[documentation for release 2.10.2]
+ * link:v2.10.3/git.html[documentation for release 2.10.3]
  
  * release notes for
+   link:RelNotes/2.10.3.txt[2.10.3],
    link:RelNotes/2.10.2.txt[2.10.2],
    link:RelNotes/2.10.1.txt[2.10.1],
    link:RelNotes/2.10.0.txt[2.10].
  
- * link:v2.9.3/git.html[documentation for release 2.9.3]
+ * link:v2.9.4/git.html[documentation for release 2.9.4]
  
  * release notes for
+   link:RelNotes/2.9.4.txt[2.9.4],
    link:RelNotes/2.9.3.txt[2.9.3],
    link:RelNotes/2.9.2.txt[2.9.2],
    link:RelNotes/2.9.1.txt[2.9.1],
    link:RelNotes/2.9.0.txt[2.9].
  
- * link:v2.8.4/git.html[documentation for release 2.8.4]
+ * link:v2.8.5/git.html[documentation for release 2.8.5]
  
  * release notes for
+   link:RelNotes/2.8.5.txt[2.8.5],
    link:RelNotes/2.8.4.txt[2.8.4],
    link:RelNotes/2.8.3.txt[2.8.3],
    link:RelNotes/2.8.2.txt[2.8.2],
    link:RelNotes/2.8.1.txt[2.8.1],
    link:RelNotes/2.8.0.txt[2.8].
  
- * link:v2.7.3/git.html[documentation for release 2.7.3]
+ * link:v2.7.5/git.html[documentation for release 2.7.5]
  
  * release notes for
+   link:RelNotes/2.7.5.txt[2.7.5],
+   link:RelNotes/2.7.4.txt[2.7.4],
    link:RelNotes/2.7.3.txt[2.7.3],
    link:RelNotes/2.7.2.txt[2.7.2],
    link:RelNotes/2.7.1.txt[2.7.1],
    link:RelNotes/2.7.0.txt[2.7].
  
- * link:v2.6.6/git.html[documentation for release 2.6.6]
+ * link:v2.6.7/git.html[documentation for release 2.6.7]
  
  * release notes for
+   link:RelNotes/2.6.7.txt[2.6.7],
    link:RelNotes/2.6.6.txt[2.6.6],
    link:RelNotes/2.6.5.txt[2.6.5],
    link:RelNotes/2.6.4.txt[2.6.4],
    link:RelNotes/2.6.1.txt[2.6.1],
    link:RelNotes/2.6.0.txt[2.6].
  
- * link:v2.5.5/git.html[documentation for release 2.5.5]
+ * link:v2.5.6/git.html[documentation for release 2.5.6]
  
  * release notes for
+   link:RelNotes/2.5.6.txt[2.5.6],
    link:RelNotes/2.5.5.txt[2.5.5],
    link:RelNotes/2.5.4.txt[2.5.4],
    link:RelNotes/2.5.3.txt[2.5.3],
    link:RelNotes/2.5.1.txt[2.5.1],
    link:RelNotes/2.5.0.txt[2.5].
  
- * link:v2.4.11/git.html[documentation for release 2.4.11]
+ * link:v2.4.12/git.html[documentation for release 2.4.12]
  
  * release notes for
+   link:RelNotes/2.4.12.txt[2.4.12],
    link:RelNotes/2.4.11.txt[2.4.11],
    link:RelNotes/2.4.10.txt[2.4.10],
    link:RelNotes/2.4.9.txt[2.4.9],
@@@ -1027,12 -1037,6 +1037,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)