Merge branch 'jc/maint-apply-no-double-patch'

diff --git a/builtin/update-server-info.c b/builtin/update-server-info.c
index 2b3fddcc69087d856b6a9c9f4383c5577a759c77..b90dce6358153b274a1e26afde9cc89aad473d14 100644 (file)
--- a/builtin/update-server-info.c
+++ b/builtin/update-server-info.c
@@ -11,8 +11,7 @@ int cmd_update_server_info(int argc, const char **argv, const char *prefix)
 {
        int force = 0;
        struct option options[] = {
-               OPT_BOOLEAN('f', "force", &force,
-                       "update the info files from scratch"),
+               OPT__FORCE(&force, "update the info files from scratch"),
                OPT_END()
        };