diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-16 14:32:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-16 14:32:32 -0700 |
| commit | c7997e54a5dd75803657b25aea101255f388ac08 (patch) | |
| tree | 2dc49a343351b57281ba5f1b06f6fe3133ef3610 /builtin/pull.c | |
| parent | 22f698cb188243b313e024d618283e0293e37140 (diff) | |
| parent | e7a7401f8ba22995708fb015b7c75f45256e05bf (diff) | |
| download | git-c7997e54a5dd75803657b25aea101255f388ac08.tar.gz git-c7997e54a5dd75803657b25aea101255f388ac08.tar.xz | |
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
Diffstat (limited to 'builtin/pull.c')
| -rw-r--r-- | builtin/pull.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index a39bb0a11..bf3fd3f9c 100644 --- 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 }; |