From d65fdc9c5dbb44b60f841352699acbe54de37b95 Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Wed, 7 Sep 2016 22:33:08 -0600 Subject: am: put spaces around pipe in usage string This makes the style a little more consistent with other usage strings, and will resolve a warning at https://www.softcatala.org/recursos/quality/git.html Signed-off-by: Alex Henrie Signed-off-by: Junio C Hamano diff --git a/builtin/am.c b/builtin/am.c index 739b34d..9e2ae5c 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 [] [(|)...]"), + N_("git am [] [( | )...]"), N_("git am [] (--continue | --skip | --abort)"), NULL }; -- cgit v0.10.2-6-g49f6 From 88c782942cdd756cf0a0a720dd6f91e785ff57f2 Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Wed, 7 Sep 2016 22:34:00 -0600 Subject: cat-file: put spaces around pipes in usage string This makes the style a little more consistent with other usage strings, and will resolve a warning at https://www.softcatala.org/recursos/quality/git.html Signed-off-by: Alex Henrie Signed-off-by: Junio C Hamano 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||--textconv) "), + N_("git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | | --textconv) "), N_("git cat-file (--batch | --batch-check) [--follow-symlinks]"), NULL }; -- cgit v0.10.2-6-g49f6 From 7c406bd8a7511c6e16f4dbe2ab5d7e57db7a8f72 Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Wed, 7 Sep 2016 22:34:17 -0600 Subject: git-rebase--interactive: fix English grammar Signed-off-by: Alex Henrie Signed-off-by: Junio C Hamano diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 7e558b0..6fd6d4e 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 ")" -- cgit v0.10.2-6-g49f6 From 1c67d534d9d807639a505835eb3505b103426b47 Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Wed, 7 Sep 2016 22:34:40 -0600 Subject: git-merge-octopus: do not capitalize "octopus" In English, only proper nouns are capitalized. Signed-off-by: Alex Henrie Signed-off-by: Junio C Hamano diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index 308eafd..bcf0d92 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 -- cgit v0.10.2-6-g49f6 From a1c8044662947caeefc9d8f5c31dc77548d81cb4 Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Wed, 7 Sep 2016 22:34:53 -0600 Subject: unpack-trees: do not capitalize "working" In English, only proper nouns are capitalized. Signed-off-by: Alex Henrie Signed-off-by: Junio C Hamano diff --git a/unpack-trees.c b/unpack-trees.c index 11c37fb..c87a90a 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 */ -- cgit v0.10.2-6-g49f6