config.txt: move ssh.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
d3df42705d
commit
12e602490c
@ -621,42 +621,6 @@ Environment variable settings always override any matches. The URLs that are
|
|||||||
matched against are those given directly to Git commands. This means any URLs
|
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.
|
visited as a result of a redirection do not participate in matching.
|
||||||
|
|
||||||
ssh.variant::
|
|
||||||
By default, Git determines the command line arguments to use
|
|
||||||
based on the basename of the configured SSH command (configured
|
|
||||||
using the environment variable `GIT_SSH` or `GIT_SSH_COMMAND` or
|
|
||||||
the config setting `core.sshCommand`). If the basename is
|
|
||||||
unrecognized, Git will attempt to detect support of OpenSSH
|
|
||||||
options by first invoking the configured SSH command with the
|
|
||||||
`-G` (print configuration) option and will subsequently use
|
|
||||||
OpenSSH options (if that is successful) or no options besides
|
|
||||||
the host and remote command (if it fails).
|
|
||||||
+
|
|
||||||
The config variable `ssh.variant` can be set to override this detection.
|
|
||||||
Valid values are `ssh` (to use OpenSSH options), `plink`, `putty`,
|
|
||||||
`tortoiseplink`, `simple` (no options except the host and remote command).
|
|
||||||
The default auto-detection can be explicitly requested using the value
|
|
||||||
`auto`. Any other value is treated as `ssh`. This setting can also be
|
|
||||||
overridden via the environment variable `GIT_SSH_VARIANT`.
|
|
||||||
+
|
|
||||||
The current command-line parameters used for each variant are as
|
|
||||||
follows:
|
|
||||||
+
|
|
||||||
--
|
|
||||||
|
|
||||||
* `ssh` - [-p port] [-4] [-6] [-o option] [username@]host command
|
|
||||||
|
|
||||||
* `simple` - [username@]host command
|
|
||||||
|
|
||||||
* `plink` or `putty` - [-P port] [-4] [-6] [username@]host command
|
|
||||||
|
|
||||||
* `tortoiseplink` - [-P port] [-4] [-6] -batch [username@]host command
|
|
||||||
|
|
||||||
--
|
|
||||||
+
|
|
||||||
Except for the `simple` variant, command-line parameters are likely to
|
|
||||||
change as git gains new features.
|
|
||||||
|
|
||||||
i18n.commitEncoding::
|
i18n.commitEncoding::
|
||||||
Character encoding the commit messages are stored in; Git itself
|
Character encoding the commit messages are stored in; Git itself
|
||||||
does not care per se, but this information is necessary e.g. when
|
does not care per se, but this information is necessary e.g. when
|
||||||
@ -1298,6 +1262,8 @@ splitIndex.sharedIndexExpire::
|
|||||||
either created based on it or read from it.
|
either created based on it or read from it.
|
||||||
See linkgit:git-update-index[1].
|
See linkgit:git-update-index[1].
|
||||||
|
|
||||||
|
include::config/ssh.txt[]
|
||||||
|
|
||||||
status.relativePaths::
|
status.relativePaths::
|
||||||
By default, linkgit:git-status[1] shows paths relative to the
|
By default, linkgit:git-status[1] shows paths relative to the
|
||||||
current directory. Setting this variable to `false` shows paths
|
current directory. Setting this variable to `false` shows paths
|
||||||
|
35
Documentation/config/ssh.txt
Normal file
35
Documentation/config/ssh.txt
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
ssh.variant::
|
||||||
|
By default, Git determines the command line arguments to use
|
||||||
|
based on the basename of the configured SSH command (configured
|
||||||
|
using the environment variable `GIT_SSH` or `GIT_SSH_COMMAND` or
|
||||||
|
the config setting `core.sshCommand`). If the basename is
|
||||||
|
unrecognized, Git will attempt to detect support of OpenSSH
|
||||||
|
options by first invoking the configured SSH command with the
|
||||||
|
`-G` (print configuration) option and will subsequently use
|
||||||
|
OpenSSH options (if that is successful) or no options besides
|
||||||
|
the host and remote command (if it fails).
|
||||||
|
+
|
||||||
|
The config variable `ssh.variant` can be set to override this detection.
|
||||||
|
Valid values are `ssh` (to use OpenSSH options), `plink`, `putty`,
|
||||||
|
`tortoiseplink`, `simple` (no options except the host and remote command).
|
||||||
|
The default auto-detection can be explicitly requested using the value
|
||||||
|
`auto`. Any other value is treated as `ssh`. This setting can also be
|
||||||
|
overridden via the environment variable `GIT_SSH_VARIANT`.
|
||||||
|
+
|
||||||
|
The current command-line parameters used for each variant are as
|
||||||
|
follows:
|
||||||
|
+
|
||||||
|
--
|
||||||
|
|
||||||
|
* `ssh` - [-p port] [-4] [-6] [-o option] [username@]host command
|
||||||
|
|
||||||
|
* `simple` - [username@]host command
|
||||||
|
|
||||||
|
* `plink` or `putty` - [-P port] [-4] [-6] [username@]host command
|
||||||
|
|
||||||
|
* `tortoiseplink` - [-P port] [-4] [-6] -batch [username@]host command
|
||||||
|
|
||||||
|
--
|
||||||
|
+
|
||||||
|
Except for the `simple` variant, command-line parameters are likely to
|
||||||
|
change as git gains new features.
|
Loading…
Reference in New Issue
Block a user