summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Torsten Bögershausen <tboegi@web.de>2015-02-21 16:52:55 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-02-22 12:04:01 -0800
commit3f55ccab8e0fec73c8e38b909e9bb4963bfb8f6a (patch)
tree97b620c4487f3f9c71e64de02067d8e6d268cd12 /Documentation/merge-options.txt
parentt5601: add more test cases for IPV6 (diff)
downloadtgif-3f55ccab8e0fec73c8e38b909e9bb4963bfb8f6a.tar.xz
t5500: show user name and host in diag-url
The URL for ssh may have include a username before the hostname, like ssh://user@host/repo. When literal IPV6 addresses are used together with a username, the substring "user@[::1]" must be converted into "user@::1". Make that conversion visible for the user, and write userandhost in the diagnostics Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions