Merge branch 'master' into cc/trace

diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 401bfb2d9cc4db22d0dd12b5c086ad537896fe65..66fc478f5736957d56de10ddc69c5c0fd9aad9c6 100644 (file)
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -3,7 +3,7 @@ git-rm(1)
 
 NAME
 ----
-git-rm - Remove files from the working tree and from the index.
+git-rm - Remove files from the working tree and from the index
 
 SYNOPSIS
 --------
@@ -32,7 +32,7 @@ OPTIONS
 -v::
         Be verbose.
 
---::
+\--::
        This option can be used to separate command-line options from
        the list of files, (useful when filenames might be mistaken
        for command-line options).
@@ -74,6 +74,9 @@ git-rm -f git-*.sh::
        shell expand the asterisk (i.e. you are listing the files
        explicitly), it does not remove `subdir/git-foo.sh`.
 
+See Also
+--------
+gitlink:git-add[1]
 
 Author
 ------