summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-15 21:11:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-15 21:11:15 (GMT)
commit4fa1251bc24e04dcc78bf93b9fd6344e6fd2a114 (patch)
treea88a42952681e906dddbc54abbb5791a4c62988f /builtin
parent581c08e8020db08140bb0e26a3ade1db0aba5fbb (diff)
parenta1c8044662947caeefc9d8f5c31dc77548d81cb4 (diff)
downloadgit-4fa1251bc24e04dcc78bf93b9fd6344e6fd2a114.zip
git-4fa1251bc24e04dcc78bf93b9fd6344e6fd2a114.tar.gz
git-4fa1251bc24e04dcc78bf93b9fd6344e6fd2a114.tar.bz2
Merge branch 'ah/misc-message-fixes'
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.c2
-rw-r--r--builtin/cat-file.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/am.c b/builtin/am.c
index b36d1f0..9daeb27 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -2209,7 +2209,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 2dfe626..560f6c2 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
};