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>
Pieter de Bie committed
Aug 9, 2008 at 00:37 UTC
01144f20955bfbb6463c9649d90f411839ad1617
2 files changed
+3
-2
Documentation/git-rm.txt
+2
-1
@@ -7,7 +7,7 @@ git-rm - Remove files from the working tree and from the index
7
8
SYNOPSIS
9
--------
10
-'git rm' [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...
10
+'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...
11
12
DESCRIPTION
13
-----------
@@ -36,6 +36,7 @@ OPTIONS
36
but this requires the `-r` option to be explicitly given.
37
38
-f::
39
+--force::
40
Override the up-to-date check.
41
42
-n::
builtin-rm.c
+1
-1
@@ -131,7 +131,7 @@ static struct option builtin_rm_options[] = {
131
OPT__DRY_RUN(&show_only),
132
OPT__QUIET(&quiet),
133
OPT_BOOLEAN( 0 , "cached", &index_only, "only remove from the index"),
134
- OPT_BOOLEAN('f', NULL, &force, "override the up-to-date check"),
134
+ OPT_BOOLEAN('f', "force", &force, "override the up-to-date check"),
135
OPT_BOOLEAN('r', NULL, &recursive, "allow recursive removal"),
136
OPT_BOOLEAN( 0 , "ignore-unmatch", &ignore_unmatch,
137
"exit with a zero status even if nothing matched"),