Merge branch 'ff/svnimport' into next

diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
index c3152b17e7902c2a8f9c5f6c75a002386a7d7d8b..ae4c1a250e835bd39ee291088ba74c3c57604ac9 100644 (file)
--- a/Documentation/git-ls-remote.txt
+++ b/Documentation/git-ls-remote.txt
@@ -1,10 +1,9 @@
 git-ls-remote(1)
 ================
-v0.1, May 2005
 
 NAME
 ----
-git-ls-remote - Look at references other repository has.
+git-ls-remote - Look at references other repository has
 
 
 SYNOPSIS
@@ -18,7 +17,7 @@ Displays the references other repository has.
 
 OPTIONS
 -------
---heads --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
@@ -60,5 +59,5 @@ Written by Junio C Hamano <junkio@cox.net>
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite