This adds a --force flag to git-rm, making it somewhat easier for subversion people to switch. Signed-off-by: Pieter de Bie <pdebie@xxxxxxxxx> --- I heard some people complain about how they try "svn rm -f" or "git rm --force", which both fail. We can help them a bit by supporting --force too. builtin-rm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/builtin-rm.c b/builtin-rm.c index ee8247b..4c9f483 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"), -- 1.6.0.rc1.288.g5b89f -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html