Merge branch 'ag/rewrite_one' into maint

[git.git] / Documentation / git-ls-remote.txt

diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
index c5ba0aad13c35f63da821192f6ae3fa1f81e9e32..f282164e9bb3d724c9904ca94da7757fe98cb8b2 100644 (file)
--- a/Documentation/git-ls-remote.txt
+++ b/Documentation/git-ls-remote.txt
@@ -20,13 +20,17 @@ commit IDs.
 
 OPTIONS
 -------
 
 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.
 
        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>::
+-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
        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


@@ -65,8 +69,8 @@ EXAMPLES
 
 Author
 ------
 
 Author
 ------

-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>

 
 GIT
 ---
 
 GIT
 ---

-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite