Merge branch 'jn/lstree'

[git.git] / Documentation / git-rm.txt

diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 3a8f279e1a5b699f23f908540f828a87a3a4d779..a65f24a0f698eb801ac43bba5aa7dc746e96edc0 100644 (file)
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -7,7 +7,7 @@ git-rm - Remove files from the working tree and from the index
 
 SYNOPSIS
 --------
-'git-rm' [-f] [-n] [-r] [--cached] [--] <file>...
+'git-rm' [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...
 
 DESCRIPTION
 -----------
@@ -47,6 +47,13 @@ OPTIONS
        the paths only from the index, leaving working tree
        files.
 
+\--ignore-unmatch::
+       Exit with a zero status even if no files matched.
+
+\--quiet::
+       git-rm normally outputs one line (in the form of an "rm" command)
+       for each file removed. This option suppresses that output.
+
 
 DISCUSSION
 ----------
@@ -60,21 +67,17 @@ a file that you have not told git about does not remove that file.
 EXAMPLES
 --------
 git-rm Documentation/\\*.txt::
-
        Removes all `\*.txt` files from the index that are under the
-       `Documentation` directory and any of its subdirectories. The
-       files are not removed from the working tree.
+       `Documentation` directory and any of its subdirectories.
 +
 Note that the asterisk `\*` is quoted from the shell in this
 example; this lets the command include the files from
 subdirectories of `Documentation/` directory.
 
 git-rm -f git-*.sh::
-
-       Remove all git-*.sh scripts that are in the index. The files
-       are removed from the index, and from the working
-       tree. Because this example lets the shell expand the
-       asterisk (i.e. you are listing the files explicitly), it
+       Remove all git-*.sh scripts that are in the index.
+       Because this example lets the shell expand the asterisk
+       (i.e. you are listing the files explicitly), it
        does not remove `subdir/git-foo.sh`.
 
 See Also