Merge fixes up to GIT 1.1.2

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 5f068c2a1ab225755a443f6a34e3c4797481cd16..92cfe0ee31a3ce6fc85ac4041ae9bb17e6419a8d 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -139,6 +139,9 @@ Interrogation commands
 gitlink:git-cat-file[1]::
        Provide content or type/size information for repository objects.
 
+gitlink:git-describe[1]::
+       Show the most recent tag that is reachable from a commit.
+
 gitlink:git-diff-index[1]::
        Compares content and mode of blobs between the index and repository.
 
@@ -422,7 +425,7 @@ gitlink:git-rev-parse[1]::
 gitlink:git-send-email[1]::
        Send patch e-mails out of "format-patch --mbox" output.
 
-gitlink:git-symbolic-refs[1]::
+gitlink:git-symbolic-ref[1]::
        Read and modify symbolic refs.
 
 gitlink:git-stripspace[1]::