Merge branch 'tr/send-email-ssl'

diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
index 445bedaa951e5546d67e1f2e556014fa2baa3549..f92f3ca1860f9d3e0d5b3f21674a9c2baf61b4d9 100644 (file)
--- a/Documentation/git-ls-remote.txt
+++ b/Documentation/git-ls-remote.txt
@@ -20,14 +20,18 @@ commit IDs.
 
 OPTIONS
 -------
--h|--heads, -t|--tags::
+-h::
+--heads::
+-t::
+--tags::
        Limit to only refs/heads and refs/tags, respectively.
        These options are _not_ mutually exclusive; when given
        both, references stored in refs/heads and refs/tags are
        displayed.
 
--u <exec>, --upload-pack=<exec>::
-       Specify the full path of gitlink:git-upload-pack[1] on the remote
+-u <exec>::
+--upload-pack=<exec>::
+       Specify the full path of linkgit:git-upload-pack[1] on the remote
        host. This allows listing references from repositories accessed via
        SSH and where the SSH daemon does not use the PATH configured by the
        user.
@@ -69,4 +73,4 @@ Written by Junio C Hamano <junkio@cox.net>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite