git-rm documentation: remove broken behaviour from the example.

The example section were talking about the old broken default
behaviour.  Correct it.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 3a8f279e1a5b699f23f908540f828a87a3a4d779..6feebc0400b86407a118840d9a6cc994a94715d6 100644 (file)
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -60,21 +60,17 @@ a file that you have not told git about does not remove that file.
 EXAMPLES
 --------
 git-rm Documentation/\\*.txt::
 EXAMPLES
 --------
 git-rm Documentation/\\*.txt::

-

        Removes all `\*.txt` files from the index that are under the
        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::
 +
 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
        does not remove `subdir/git-foo.sh`.
 
 See Also

diff --git a/builtin-rm.c b/builtin-rm.c
index d81f289c3c28fa9afbc99facf6ea81b68306a46d..00dbe399609051647f393e0c543a862a0ba432c8 100644 (file)
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -10,7 +10,7 @@
 #include "tree-walk.h"
 
 static const char builtin_rm_usage[] =
 #include "tree-walk.h"
 
 static const char builtin_rm_usage[] =

-"git-rm [-n] [-f] [--cached] <filepattern>...";
+"git-rm [-f] [-n] [-r] [--cached] [--] <file>...";

 
 static struct {
        int nr, alloc;
 
 static struct {
        int nr, alloc;