Merge branch 'pt/pull-builtin' into maint

* pt/pull-builtin: pull: enclose <options> in brackets in the usage string merge: grammofix in please-commit-before-merge message
2015-10-16 14:32:32 -07:00
parent 22f698cb18 e7a7401f8b
commit c7997e54a5
3 changed files with 3 additions and 3 deletions
--- 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
 };