Merge branch 'ah/misc-message-fixes'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Sep 2016 21:11:15 +0000 (14:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Sep 2016 21:11:15 +0000 (14:11 -0700)
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

builtin/am.c
builtin/cat-file.c
git-merge-octopus.sh
git-rebase--interactive.sh
unpack-trees.c
index b36d1f047d8124e3aeab5fabb24dd2bb2a003fdf..9daeb27225c04c28e33adc7b8e9071d825a490de 100644 (file)
@@ -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
        };
index 2dfe6265f7df6099b51645fa67dbeeb3f4f567a4..560f6c2cc72b8f489c7f113601b464f44b6e395a 100644 (file)
@@ -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
 };
index 308eafd1d38422ce5e9d4c8d90050a28795479f9..bcf0d92ec223bf9e1f0995c5acef6376d1299502 100755 (executable)
@@ -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
 
index 7e558b068c277c2f079de04eb96161c529e11337..6fd6d4e5f64bcab81fa64bf363db1b530a00a544 100644 (file)
@@ -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
 ")"
index 11c37fbc583f6867ed97eac2ee8d42ae689db71c..c87a90a08d7d56db2a64a7a42cdd365373557624 100644 (file)
@@ -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 */