Merge branch 'cb/log-follow-with-combined'

diff --git a/builtin/remote.c b/builtin/remote.c
index a5a4b232310a27c1d67dd6a1bce252cd62cfa52d..5e54d367b82cd91dbba70e2570dc620a3a13cd21 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -39,7 +39,7 @@ static const char * const builtin_remote_rm_usage[] = {
 };
 
 static const char * const builtin_remote_sethead_usage[] = {
-       N_("git remote set-head <name> (-a | -d | <branch>])"),
+       N_("git remote set-head <name> (-a | -d | <branch>)"),
        NULL
 };
 
@@ -178,7 +178,7 @@ static int add(int argc, const char **argv)
        argc = parse_options(argc, argv, NULL, options, builtin_remote_add_usage,
                             0);
 
-       if (argc < 2)
+       if (argc != 2)
                usage_with_options(builtin_remote_add_usage, options);
 
        if (mirror && master)