Merge branch 'pj/portable' into next

diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
index 89bd609d653d27646de8e9de12766c6fe0887575..66fe60f9985d23a02420d7733414b232e59cc22a 100644 (file)
--- a/Documentation/git-ls-remote.txt
+++ b/Documentation/git-ls-remote.txt
@@ -1,6 +1,5 @@
 git-ls-remote(1)
 ================
-v0.1, May 2005
 
 NAME
 ----
@@ -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