Merge branch 'jk/ident-loosen-getpwuid' into maint

diff --git a/builtin/pull.c b/builtin/pull.c
index a39bb0a11f72982f51222cdcf19d1010367c908f..bf3fd3f9c8d80ff84ace4150214118355585e917 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -66,7 +66,7 @@ static int parse_opt_rebase(const struct option *opt, const char *arg, int unset
 }
 
 static const char * const pull_usage[] = {
-       N_("git pull [options] [<repository> [<refspec>...]]"),
+       N_("git pull [<options>] [<repository> [<refspec>...]]"),
        NULL
 };