Sync with 2.2.2

diff --combined Documentation/git.txt
index 179615195fd260d4d6d87bc1cda6f5c8a699719d,edceb50866f184b7c17dac16a54fedd8e45ccfcb..9d334314270003d4ce54ef233691506dd4f10197
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,9 -43,10 +43,10 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v2.2.1/git.html[documentation for release 2.2.1]
+ * link:v2.2.2/git.html[documentation for release 2.2.2]
  
  * release notes for
+   link:RelNotes/2.2.2.txt[2.2.2],
    link:RelNotes/2.2.1.txt[2.2.1],
    link:RelNotes/2.2.0.txt[2.2].
  
@@@ -886,21 -887,19 +887,21 @@@ othe
        and the `core.editor` option in linkgit:git-config[1].
  
  'GIT_SSH'::
 -      If this environment variable is set then 'git fetch'
 -      and 'git push' will use this command instead
 -      of 'ssh' when they need to connect to a remote system.
 -      The '$GIT_SSH' command will be given exactly two or
 -      four arguments: the 'username@host' (or just 'host')
 -      from the URL and the shell command to execute on that
 -      remote system, optionally preceded by '-p' (literally) and
 -      the 'port' from the URL when it specifies something other
 -      than the default SSH port.
 +'GIT_SSH_COMMAND'::
 +      If either of these environment variables is set then 'git fetch'
 +      and 'git push' will use the specified command instead of 'ssh'
 +      when they need to connect to a remote system.
 +      The command will be given exactly two or four arguments: the
 +      'username@host' (or just 'host') from the URL and the shell
 +      command to execute on that remote system, optionally preceded by
 +      '-p' (literally) and the 'port' from the URL when it specifies
 +      something other than the default SSH port.
  +
 -To pass options to the program that you want to list in GIT_SSH
 -you will need to wrap the program and options into a shell script,
 -then set GIT_SSH to refer to the shell script.
 +`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted
 +by the shell, which allows additional arguments to be included.
 +`$GIT_SSH` on the other hand must be just the path to a program
 +(which can be a wrapper shell script, if additional arguments are
 +needed).
  +
  Usually it is easier to configure any desired options through your
  personal `.ssh/config` file.  Please consult your ssh documentation
@@@ -913,10 -912,6 +914,10 @@@ for further details
        and read the password from its STDOUT. See also the 'core.askpass'
        option in linkgit:git-config[1].
  
 +'GIT_TERMINAL_PROMPT'::
 +      If this environment variable is set to `0`, git will not prompt
 +      on the terminal (e.g., when asking for HTTP authentication).
 +
  'GIT_CONFIG_NOSYSTEM'::
        Whether to skip reading settings from the system-wide
        `$(prefix)/etc/gitconfig` file.  This environment variable can