diff options
| author |  Segev Finer <segev208@gmail.com> | 2017-02-01 13:01:16 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-02-01 10:57:53 -0800 |
| commit | dd33e07766f883c1bbfd20482123e143028f0af6 (patch) | |
| tree | a4becb91dcf6f626b3b74ccfc31662a50ec6c30c /Documentation/config.txt | |
| parent | git_connect(): factor out SSH variant handling (diff) | |
| download | tgif-dd33e07766f883c1bbfd20482123e143028f0af6.tar.xz | |
connect: Add the envvar GIT_SSH_VARIANT and ssh.variant config
This environment variable and configuration value allow to
override the autodetection of plink/tortoiseplink in case that
Git gets it wrong.
[jes: wrapped overly-long lines, factored out and changed
get_ssh_variant() to handle_ssh_variant() to accomodate the
change from the putty/tortoiseplink variables to
port_option/needs_batch, adjusted the documentation, free()d
value obtained from the config.]
Signed-off-by: Segev Finer <segev208@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index af2ae4cc02..b88df57ab6 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1949,6 +1949,17 @@ Environment variable settings always override any matches. The URLs that are matched against are those given directly to Git commands. This means any URLs visited as a result of a redirection do not participate in matching. +ssh.variant:: + Depending on the value of the environment variables `GIT_SSH` or + `GIT_SSH_COMMAND`, or the config setting `core.sshCommand`, Git + auto-detects whether to adjust its command-line parameters for use + with plink or tortoiseplink, as opposed to the default (OpenSSH). ++ +The config variable `ssh.variant` can be set to override this auto-detection; +valid values are `ssh`, `plink`, `putty` or `tortoiseplink`. Any other value +will be treated as normal ssh. This setting can be overridden via the +environment variable `GIT_SSH_VARIANT`. + i18n.commitEncoding:: Character encoding the commit messages are stored in; Git itself does not care per se, but this information is necessary e.g. when |