diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-19 13:51:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-19 13:51:45 -0700 |
| commit | 9f3d73e8cb2e9ae1123c218cc1ecff3032c82286 (patch) | |
| tree | 42d644f82aa73385a4bdf170faed16f527c4cc45 /builtin | |
| parent | Merge branch 'sb/transport-report-missing-submodule-on-stderr' into maint (diff) | |
| parent | unpack-trees: do not capitalize "working" (diff) | |
| download | tgif-9f3d73e8cb2e9ae1123c218cc1ecff3032c82286.tar.xz | |
Merge branch 'ah/misc-message-fixes' into maint
Message cleanup.
* ah/misc-message-fixes:
unpack-trees: do not capitalize "working"
git-merge-octopus: do not capitalize "octopus"
git-rebase--interactive: fix English grammar
cat-file: put spaces around pipes in usage string
am: put spaces around pipe in usage string
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/am.c | 2 | ||||
| -rw-r--r-- | builtin/cat-file.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/am.c b/builtin/am.c index 739b34dcf2..9e2ae5cba4 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2222,7 +2222,7 @@ int cmd_am(int argc, const char **argv, const char *prefix) int in_progress; const char * const usage[] = { - N_("git am [<options>] [(<mbox>|<Maildir>)...]"), + N_("git am [<options>] [(<mbox> | <Maildir>)...]"), N_("git am [<options>] (--continue | --skip | --abort)"), NULL }; diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 2dfe6265f7..560f6c2cc7 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -440,7 +440,7 @@ static int batch_objects(struct batch_options *opt) } static const char * const cat_file_usage[] = { - N_("git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<type>|--textconv) <object>"), + N_("git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv) <object>"), N_("git cat-file (--batch | --batch-check) [--follow-symlinks]"), NULL }; |