From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 27/59] config.txt: move ssh.* to a separate file
Date: Sat, 20 Oct 2018 14:38:16 +0200 [thread overview]
Message-ID: <20181020123848.2785-28-pclouds@gmail.com> (raw)
In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
Documentation/config.txt | 38 ++----------------------------------
Documentation/ssh-config.txt | 35 +++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 36 deletions(-)
create mode 100644 Documentation/ssh-config.txt
diff --git a/Documentation/config.txt b/Documentation/config.txt
index bb49f4c894..da97097805 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -600,42 +600,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
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::
Character encoding the commit messages are stored in; Git itself
does not care per se, but this information is necessary e.g. when
@@ -1274,6 +1238,8 @@ splitIndex.sharedIndexExpire::
either created based on it or read from it.
See linkgit:git-update-index[1].
+include::ssh-config.txt[]
+
status.relativePaths::
By default, linkgit:git-status[1] shows paths relative to the
current directory. Setting this variable to `false` shows paths
diff --git a/Documentation/ssh-config.txt b/Documentation/ssh-config.txt
new file mode 100644
index 0000000000..2ca4bf93e1
--- /dev/null
+++ b/Documentation/ssh-config.txt
@@ -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.
--
2.19.1.647.g708186aaf9
next prev parent reply other threads:[~2018-10-20 12:39 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-20 12:37 [PATCH 00/59] Split config.txt Nguyễn Thái Ngọc Duy
2018-10-20 12:37 ` [PATCH 01/59] config.txt: move advice.* to a separate file Nguyễn Thái Ngọc Duy
2018-10-20 12:37 ` [PATCH 02/59] config.txt: move core.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:37 ` [PATCH 03/59] config.txt: move add.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:37 ` [PATCH 04/59] config.txt: move alias.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:37 ` [PATCH 05/59] config.txt: move am.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:37 ` [PATCH 06/59] config.txt: move apply.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:37 ` [PATCH 07/59] config.txt: move blame.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:37 ` [PATCH 08/59] config.txt: move branch.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:37 ` [PATCH 09/59] config.txt: move browser.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:37 ` [PATCH 10/59] config.txt: move checkout.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 11/59] config.txt: move clean.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 12/59] config.txt: move color.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 13/59] config.txt: move column.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 14/59] config.txt: move commit.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 15/59] config.txt: move credential.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 16/59] config.txt: move completion.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 17/59] config.txt: move difftool.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 18/59] config.txt: move fastimport.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 19/59] config.txt: move filter.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 20/59] config.txt: move fsck.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 21/59] config.txt: move gc.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 22/59] config.txt: move gitweb.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 23/59] config.txt: move grep.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 24/59] config.txt: move gpg.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 25/59] config.txt: move guitool.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 26/59] config.txt: move help.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` Nguyễn Thái Ngọc Duy [this message]
2018-10-20 12:38 ` [PATCH 28/59] config.txt: move i18n.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 29/59] " Nguyễn Thái Ngọc Duy
2018-10-21 19:40 ` Andrei Rybak
2018-10-20 12:38 ` [PATCH 30/59] config.txt: move init.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 31/59] config.txt: move instaweb.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 32/59] config.txt: move interactive.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 33/59] config.txt: move log.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 34/59] config.txt: move mailinfo.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 35/59] config.txt: move mailmap.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 36/59] config.txt: move man.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 37/59] config.txt: move mergetool.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 38/59] config.txt: move notes.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 39/59] config.txt: move pack.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 40/59] config.txt: move pager.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 41/59] config.txt: move pretty.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 42/59] config.txt: move protocol.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 43/59] config.txt: move remote.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 44/59] config.txt: move remotes.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 45/59] config.txt: move repack.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 46/59] config.txt: move rerere.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 47/59] config.txt: move sequencer.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 48/59] config.txt: move showBranch.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 49/59] config.txt: move splitIndex.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 50/59] config.txt: move status.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 51/59] config.txt: move tag.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 52/59] config.txt: move transfer.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 53/59] config.txt: move uploadarchive.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 54/59] config.txt: move uploadpack.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 55/59] config.txt: move url.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 56/59] config.txt: move user.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 57/59] config.txt: move versionsort.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 58/59] config.txt: move web.* " Nguyễn Thái Ngọc Duy
2018-10-20 12:38 ` [PATCH 59/59] config.txt: move worktree.* " Nguyễn Thái Ngọc Duy
2018-10-20 19:25 ` [PATCH 00/59] Split config.txt Ævar Arnfjörð Bjarmason
2018-10-20 19:30 ` Duy Nguyen
2018-10-20 19:41 ` Ævar Arnfjörð Bjarmason
2018-10-20 23:29 ` Junio C Hamano
2018-10-22 14:42 ` Duy Nguyen
2018-10-22 19:22 ` Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181020123848.2785-28-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).