diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-15 14:11:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-15 14:11:15 -0700 |
| commit | 4fa1251bc24e04dcc78bf93b9fd6344e6fd2a114 (patch) | |
| tree | a88a42952681e906dddbc54abbb5791a4c62988f | |
| parent | 581c08e8020db08140bb0e26a3ade1db0aba5fbb (diff) | |
| parent | a1c8044662947caeefc9d8f5c31dc77548d81cb4 (diff) | |
| download | git-4fa1251bc24e04dcc78bf93b9fd6344e6fd2a114.tar.gz git-4fa1251bc24e04dcc78bf93b9fd6344e6fd2a114.tar.xz | |
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
| -rw-r--r-- | builtin/am.c | 2 | ||||
| -rw-r--r-- | builtin/cat-file.c | 2 | ||||
| -rwxr-xr-x | git-merge-octopus.sh | 4 | ||||
| -rw-r--r-- | git-rebase--interactive.sh | 2 | ||||
| -rw-r--r-- | unpack-trees.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/builtin/am.c b/builtin/am.c index b36d1f047..9daeb2722 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 2dfe6265f..560f6c2cc 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 }; diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index 308eafd1d..bcf0d92ec 100755 --- a/git-merge-octopus.sh +++ b/git-merge-octopus.sh @@ -30,7 +30,7 @@ do esac done -# Reject if this is not an Octopus -- resolve should be used instead. +# Reject if this is not an octopus -- resolve should be used instead. case "$remotes" in ?*' '?*) ;; @@ -59,7 +59,7 @@ do # conflicts. Last round failed and we still had # a head to merge. gettextln "Automated merge did not work." - gettextln "Should not be doing an Octopus." + gettextln "Should not be doing an octopus." exit 2 esac diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 7e558b068..6fd6d4e5f 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -1082,7 +1082,7 @@ If they are meant to go into a new commit, run: git commit \$gpg_sign_opt_quoted -In both case, once you're done, continue with: +In both cases, once you're done, continue with: git rebase --continue ")" diff --git a/unpack-trees.c b/unpack-trees.c index 11c37fbc5..c87a90a08 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -123,9 +123,9 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] = _("Cannot update sparse checkout: the following entries are not up-to-date:\n%s"); msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] = - _("The following Working tree files would be overwritten by sparse checkout update:\n%s"); + _("The following working tree files would be overwritten by sparse checkout update:\n%s"); msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] = - _("The following Working tree files would be removed by sparse checkout update:\n%s"); + _("The following working tree files would be removed by sparse checkout update:\n%s"); opts->show_all_errors = 1; /* rejected paths may not have a static buffer */ |