From a9877f83e0da46efcbc552bd439acee2dcc499d0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 16 Jan 2007 11:50:29 -0800 Subject: [PATCH] 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 --- Documentation/git-rm.txt | 12 ++++-------- builtin-rm.c | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt index 3a8f279e1..6feebc040 100644 --- 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:: - 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 diff --git a/builtin-rm.c b/builtin-rm.c index d81f289c3..00dbe3996 100644 --- a/builtin-rm.c +++ b/builtin-rm.c @@ -10,7 +10,7 @@ #include "tree-walk.h" static const char builtin_rm_usage[] = -"git-rm [-n] [-f] [--cached] ..."; +"git-rm [-f] [-n] [-r] [--cached] [--] ..."; static struct { int nr, alloc; -- 2.30.2