summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-03-26 13:14:11 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-26 13:14:11 -0700
commitf4ccd9f1bd00325a52199be008af7230b4b8f5ab (patch)
tree181c233225b03efe85075953b6d74e770efa2967 /Documentation
parentMerge branch 'we/submodule-update-prefix-output' into maint (diff)
parentCorrect the docs about GIT_SSH. (diff)
downloadtgif-f4ccd9f1bd00325a52199be008af7230b4b8f5ab.tar.xz
Merge branch 'maint-1.8.1' into maint
* maint-1.8.1: Correct the docs about GIT_SSH.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 7efaa591b8..4307d62bd4 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -774,9 +774,12 @@ other
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 arguments:
- the 'username@host' (or just 'host') from the URL and the
- shell command to execute on that 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.
+
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,