diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2010-11-08 19:01:54 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-15 10:04:43 -0800 |
| commit | 76946b76fe3d26507d61cae97aa0676fad24ed92 (patch) | |
| tree | cb637a3012a3b7f5f448ff660106ba1e2595da09 /builtin/rm.c | |
| parent | d52ee6e6131f65bb4360743ebea2e7b400b544e4 (diff) | |
| download | git-76946b76fe3d26507d61cae97aa0676fad24ed92.tar.gz git-76946b76fe3d26507d61cae97aa0676fad24ed92.tar.xz | |
add OPT__FORCE
Add OPT__FORCE as a helper macro in the same spirit as OPT__VERBOSE
et.al. to simplify defining -f/--force options.
Signed-off-by: Rene Scharfe <rene.scharfe@lstfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rm.c')
| -rw-r--r-- | builtin/rm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rm.c b/builtin/rm.c index 49461b60c..9a5990513 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -142,7 +142,7 @@ static struct option builtin_rm_options[] = { OPT__DRY_RUN(&show_only, "dry run"), OPT__QUIET(&quiet, "be quiet"), OPT_BOOLEAN( 0 , "cached", &index_only, "only remove from the index"), - OPT_BOOLEAN('f', "force", &force, "override the up-to-date check"), + OPT__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"), |