aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-19 11:38:35 -0700
committerJunio C Hamano <gitster@pobox.com>2014-09-19 11:38:35 -0700
commit296b4c4bbf63c8addb1654a05950843e9984d0eb (patch)
tree2a93522efd6d616bc60372d945c3b43d1f2fb54f /builtin
parent4fc72d91066d8fcb6de25596429fd603d3d91d79 (diff)
parentad5fe3771b50f3862130d150b5cc8bb316ef6f1c (diff)
downloadgit-296b4c4bbf63c8addb1654a05950843e9984d0eb.tar.gz
git-296b4c4bbf63c8addb1654a05950843e9984d0eb.tar.xz
Merge branch 'ah/grammofix'
* ah/grammofix: grammofix in user-facing messages
Diffstat (limited to 'builtin')
-rw-r--r--builtin/commit.c2
-rw-r--r--builtin/ls-files.c2
-rw-r--r--builtin/merge.c4
-rw-r--r--builtin/notes.c2
-rw-r--r--builtin/rm.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index 4a45bedc0..b0fe7847d 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1826,7 +1826,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
if (commit_index_files())
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."));
rerere(0);
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 47c38808a..99cee20fb 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -474,7 +474,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
OPT_BOOL('k', "killed", &show_killed,
N_("show files on the filesystem that need to be removed")),
OPT_BIT(0, "directory", &dir.flags,
- N_("show 'other' directories' name only"),
+ N_("show 'other' directories' names only"),
DIR_SHOW_OTHER_DIRECTORIES),
OPT_NEGBIT(0, "empty-directory", &dir.flags,
N_("don't show empty directories"),
diff --git a/builtin/merge.c b/builtin/merge.c
index 9da9e30d9..ec6fa9398 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1143,14 +1143,14 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
*/
if (advice_resolve_conflict)
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
die(_("You have not concluded your merge (MERGE_HEAD exists)."));
}
if (file_exists(git_path("CHERRY_PICK_HEAD"))) {
if (advice_resolve_conflict)
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
die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
}
diff --git a/builtin/notes.c b/builtin/notes.c
index c25a41251..67d0bb14f 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -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)) {
error(_("unable to write note object"));
if (path)
- error(_("The note contents has been left in %s"),
+ error(_("The note contents have been left in %s"),
path);
exit(128);
}
diff --git a/builtin/rm.c b/builtin/rm.c
index bc6490b8b..2b61d3bd4 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -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 "
"submodules)\n"
"uses a .git directory:",
- "the following submodules (or one of its nested "
+ "the following submodules (or one of their nested "
"submodules)\n"
"use a .git directory:", files->nr),
_("\n(use 'rm -rf' if you really want to remove "