Merge branch 'jc/combine' into next

diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
index c0a80d4089d88417d0d91dbf44f728608ea1c467..ae4c1a250e835bd39ee291088ba74c3c57604ac9 100644 (file)
--- a/Documentation/git-ls-remote.txt
+++ b/Documentation/git-ls-remote.txt
@@ -3,7 +3,7 @@ git-ls-remote(1)
 
 NAME
 ----
-git-ls-remote - Look at references other repository has.
+git-ls-remote - Look at references other repository has
 
 
 SYNOPSIS
@@ -17,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