From: Pieter de Bie Date: Fri, 8 Aug 2008 22:37:02 +0000 (+0200) Subject: builtin-rm: Add a --force flag X-Git-Tag: v1.6.0-rc3~17 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=01144f20955bfbb6463c9649d90f411839ad1617;p=git.git 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 Signed-off-by: Junio C Hamano --- 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] [--] ... +'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] ... 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"),