Merge branch 'nd/maint-relative'

diff --git a/builtin/rm.c b/builtin/rm.c
index 26b7412aaa2d365d4e28093f1cb8e2343e3c6135..c7b7bb37a2378aaeeddbbdfacd0f0a62337ec152 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -140,9 +140,9 @@ static int ignore_unmatch = 0;
 
 static struct option builtin_rm_options[] = {
        OPT__DRY_RUN(&show_only, "dry run"),
-       OPT__QUIET(&quiet),
+       OPT__QUIET(&quiet, "do not list removed files"),
        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"),