undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ah/grammofix'

Browse Source 
* ah/grammofix:
  grammofix in user-facing messages
This commit is contained in:
Junio C Hamano 2014-09-19 11:38:35 -07:00
commit 296b4c4bbf
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/commit.c
View File

@ -1826,7 +1826,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
if (commit_index_files()) if (commit_index_files())
die (_("Repository has been updated, but unable to write\n" die (_("Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n" "new_index file. Check that disk is not full and quota is\n"
"not exceeded, and then \"git reset HEAD\" to recover.")); "not exceeded, and then \"git reset HEAD\" to recover."));
rerere(0); rerere(0);

2
builtin/ls-files.c
View File

@ -474,7 +474,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
OPT_BOOL('k', "killed", &show_killed, OPT_BOOL('k', "killed", &show_killed,
N_("show files on the filesystem that need to be removed")), N_("show files on the filesystem that need to be removed")),
OPT_BIT(0, "directory", &dir.flags, OPT_BIT(0, "directory", &dir.flags,
N_("show 'other' directories' name only"), N_("show 'other' directories' names only"),
DIR_SHOW_OTHER_DIRECTORIES), DIR_SHOW_OTHER_DIRECTORIES),
OPT_NEGBIT(0, "empty-directory", &dir.flags, OPT_NEGBIT(0, "empty-directory", &dir.flags,
N_("don't show empty directories"), N_("don't show empty directories"),

4
builtin/merge.c
View File

@ -1143,14 +1143,14 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
*/ */
if (advice_resolve_conflict) if (advice_resolve_conflict)
die(_("You have not concluded your merge (MERGE_HEAD exists).\n" die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you can merge.")); "Please, commit your changes before you merge."));
else else
die(_("You have not concluded your merge (MERGE_HEAD exists).")); die(_("You have not concluded your merge (MERGE_HEAD exists)."));
} }
if (file_exists(git_path("CHERRY_PICK_HEAD"))) { if (file_exists(git_path("CHERRY_PICK_HEAD"))) {
if (advice_resolve_conflict) if (advice_resolve_conflict)
die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you can merge.")); "Please, commit your changes before you merge."));
else else
die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).")); die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
} }

2
builtin/notes.c
View File

@ -210,7 +210,7 @@ static void create_note(const unsigned char *object, struct msg_arg *msg,
if (write_sha1_file(msg->buf.buf, msg->buf.len, blob_type, result)) { if (write_sha1_file(msg->buf.buf, msg->buf.len, blob_type, result)) {
error(_("unable to write note object")); error(_("unable to write note object"));
if (path) if (path)
error(_("The note contents has been left in %s"), error(_("The note contents have been left in %s"),
path); path);
exit(128); exit(128);
} }

2
builtin/rm.c
View File

@ -65,7 +65,7 @@ static void error_removing_concrete_submodules(struct string_list *files, int *e
Q_("the following submodule (or one of its nested " Q_("the following submodule (or one of its nested "
"submodules)\n" "submodules)\n"
"uses a .git directory:", "uses a .git directory:",
"the following submodules (or one of its nested " "the following submodules (or one of their nested "
"submodules)\n" "submodules)\n"
"use a .git directory:", files->nr), "use a .git directory:", files->nr),
_("\n(use 'rm -rf' if you really want to remove " _("\n(use 'rm -rf' if you really want to remove "

4
git-bisect.sh
View File

@ -286,11 +286,11 @@ bisect_next_check() {
if test -s "$GIT_DIR/BISECT_START" if test -s "$GIT_DIR/BISECT_START"
then then
gettextln "You need to give me at least one good and one bad revisions. gettextln "You need to give me at least one good and one bad revision.
(You can use \"git bisect bad\" and \"git bisect good\" for that.)" >&2 (You can use \"git bisect bad\" and \"git bisect good\" for that.)" >&2
else else
gettextln "You need to start by \"git bisect start\". gettextln "You need to start by \"git bisect start\".
You then need to give me at least one good and one bad revisions. You then need to give me at least one good and one bad revision.
(You can use \"git bisect bad\" and \"git bisect good\" for that.)" >&2 (You can use \"git bisect bad\" and \"git bisect good\" for that.)" >&2
fi fi
exit 1 ;; exit 1 ;;

2
git-stash.sh
View File

@ -394,7 +394,7 @@ parse_flags_and_rev()
REV=$(git rev-parse --quiet --symbolic --verify "$1" 2>/dev/null) || { REV=$(git rev-parse --quiet --symbolic --verify "$1" 2>/dev/null) || {
reference="$1" reference="$1"
die "$(eval_gettext "\$reference is not valid reference")" die "$(eval_gettext "\$reference is not a valid reference")"
} }
i_commit=$(git rev-parse --quiet --verify "$REV^2" 2>/dev/null) && i_commit=$(git rev-parse --quiet --verify "$REV^2" 2>/dev/null) &&

2
git.c
View File

@ -14,7 +14,7 @@ const char git_usage_string[] =
" <command> [<args>]"; " <command> [<args>]";
const char git_more_info_string[] = const char git_more_info_string[] =
N_("'git help -a' and 'git help -g' lists available subcommands and some\n" N_("'git help -a' and 'git help -g' list available subcommands and some\n"
"concept guides. See 'git help <command>' or 'git help <concept>'\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n"
"to read about a specific subcommand or concept."); "to read about a specific subcommand or concept.");