summaryrefslogtreecommitdiff
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-19 18:38:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-09-19 18:38:35 (GMT)
commit296b4c4bbf63c8addb1654a05950843e9984d0eb (patch)
tree2a93522efd6d616bc60372d945c3b43d1f2fb54f /builtin/commit.c
parent4fc72d91066d8fcb6de25596429fd603d3d91d79 (diff)
parentad5fe3771b50f3862130d150b5cc8bb316ef6f1c (diff)
downloadgit-296b4c4bbf63c8addb1654a05950843e9984d0eb.zip
git-296b4c4bbf63c8addb1654a05950843e9984d0eb.tar.gz
git-296b4c4bbf63c8addb1654a05950843e9984d0eb.tar.bz2
Merge branch 'ah/grammofix'
* ah/grammofix: grammofix in user-facing messages
Diffstat (limited to 'builtin/commit.c')
-rw-r--r--builtin/commit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index 4a45bed..b0fe784 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);