diff options
| author | Pieter de Bie <pdebie@ai.rug.nl> | 2008-08-09 00:37:02 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-08 18:27:19 -0700 |
| commit | 01144f20955bfbb6463c9649d90f411839ad1617 (patch) | |
| tree | 95df52bf8e6c7c3de9540266b496bee5db293945 | |
| parent | 222566e42cfc339b31db4757800cc387bcd8c20e (diff) | |
| download | git-01144f20955bfbb6463c9649d90f411839ad1617.tar.gz git-01144f20955bfbb6463c9649d90f411839ad1617.tar.xz | |
builtin-rm: Add a --force flag
This adds a --force flag to git-rm, making it somewhat easier for
subversion people to switch.
Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-rm.txt | 3 | ||||
| -rw-r--r-- | builtin-rm.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt index 4d0c495bc..5afb1e742 100644 --- 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] [--ignore-unmatch] [--quiet] [--] <file>... +'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>... DESCRIPTION ----------- @@ -36,6 +36,7 @@ OPTIONS but this requires the `-r` option to be explicitly given. -f:: +--force:: Override the up-to-date check. -n:: diff --git a/builtin-rm.c b/builtin-rm.c index ee8247b08..0ed26bb8f 100644 --- a/builtin-rm.c +++ b/builtin-rm.c @@ -131,7 +131,7 @@ static struct option builtin_rm_options[] = { OPT__DRY_RUN(&show_only), OPT__QUIET(&quiet), OPT_BOOLEAN( 0 , "cached", &index_only, "only remove from the index"), - OPT_BOOLEAN('f', NULL, &force, "override the up-to-date check"), + OPT_BOOLEAN('f', "force", &force, "override the up-to-date check"), OPT_BOOLEAN('r', NULL, &recursive, "allow recursive removal"), OPT_BOOLEAN( 0 , "ignore-unmatch", &ignore_unmatch, "exit with a zero status even if nothing matched"), |