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>
Nguyễn Thái Ngọc Duy committed
Oct 27, 2018 at 08:23 UTC
12e602490c76ccfdc7e808cd93735b9c3d75f626
2 files changed
+37
-36
Documentation/config.txt
+2
-36
@@ -621,42 +621,6 @@ Environment variable settings always override any matches. The URLs that are
621
matched against are those given directly to Git commands. This means any URLs
622
visited as a result of a redirection do not participate in matching.
623
624
-ssh.variant::
625
- By default, Git determines the command line arguments to use
626
- based on the basename of the configured SSH command (configured
627
- using the environment variable `GIT_SSH` or `GIT_SSH_COMMAND` or
628
- the config setting `core.sshCommand`). If the basename is
629
- unrecognized, Git will attempt to detect support of OpenSSH
630
- options by first invoking the configured SSH command with the
631
- `-G` (print configuration) option and will subsequently use
632
- OpenSSH options (if that is successful) or no options besides
633
- the host and remote command (if it fails).
634
-+
635
-The config variable `ssh.variant` can be set to override this detection.
636
-Valid values are `ssh` (to use OpenSSH options), `plink`, `putty`,
637
-`tortoiseplink`, `simple` (no options except the host and remote command).
638
-The default auto-detection can be explicitly requested using the value
639
-`auto`. Any other value is treated as `ssh`. This setting can also be
640
-overridden via the environment variable `GIT_SSH_VARIANT`.
641
-+
642
-The current command-line parameters used for each variant are as
643
-follows:
644
-+
645
---
646
-
647
-* `ssh` - [-p port] [-4] [-6] [-o option] [username@]host command
648
-
649
-* `simple` - [username@]host command
650
-
651
-* `plink` or `putty` - [-P port] [-4] [-6] [username@]host command
652
-
653
-* `tortoiseplink` - [-P port] [-4] [-6] -batch [username@]host command
654
-
655
---
656
-+
657
-Except for the `simple` variant, command-line parameters are likely to
658
-change as git gains new features.
659
-
624
i18n.commitEncoding::
625
Character encoding the commit messages are stored in; Git itself
626
does not care per se, but this information is necessary e.g. when
@@ -1298,6 +1262,8 @@ splitIndex.sharedIndexExpire::
1262
either created based on it or read from it.
1263
See linkgit:git-update-index[1].
1264
1265
+include::config/ssh.txt[]
1266
+
1267
status.relativePaths::
1268
By default, linkgit:git-status[1] shows paths relative to the
1269
current directory. Setting this variable to `false` shows paths
Documentation/config/ssh.txt
new
+35
@@ -0,0 +1,35 @@
1
+ssh.variant::
2
+ By default, Git determines the command line arguments to use
3
+ based on the basename of the configured SSH command (configured
4
+ using the environment variable `GIT_SSH` or `GIT_SSH_COMMAND` or
5
+ the config setting `core.sshCommand`). If the basename is
6
+ unrecognized, Git will attempt to detect support of OpenSSH
7
+ options by first invoking the configured SSH command with the
8
+ `-G` (print configuration) option and will subsequently use
9
+ OpenSSH options (if that is successful) or no options besides
10
+ the host and remote command (if it fails).
11
++
12
+The config variable `ssh.variant` can be set to override this detection.
13
+Valid values are `ssh` (to use OpenSSH options), `plink`, `putty`,
14
+`tortoiseplink`, `simple` (no options except the host and remote command).
15
+The default auto-detection can be explicitly requested using the value
16
+`auto`. Any other value is treated as `ssh`. This setting can also be
17
+overridden via the environment variable `GIT_SSH_VARIANT`.
18
++
19
+The current command-line parameters used for each variant are as
20
+follows:
21
++
22
+--
23
+
24
+* `ssh` - [-p port] [-4] [-6] [-o option] [username@]host command
25
+
26
+* `simple` - [username@]host command
27
+
28
+* `plink` or `putty` - [-P port] [-4] [-6] [username@]host command
29
+
30
+* `tortoiseplink` - [-P port] [-4] [-6] -batch [username@]host command
31
+
32
+--
33
++
34
+Except for the `simple` variant, command-line parameters are likely to
35
+change as git gains new features.