development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ah/misc-message-fixes'

Browse source 
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
This commit is contained in:
Junio C Hamano 2016-09-15 14:11:15 -07:00
parent 581c08e802 a1c8044662
commit 4fa1251bc2
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin/am.c
View 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
};

2
builtin/cat-file.c
View 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
};

4
git-merge-octopus.sh
View file

@ -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

2
git-rebase--interactive.sh
View 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
")"

4
unpack-trees.c
View 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 */