summaryrefslogtreecommitdiff
path: root/builtin/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-22 18:23:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-22 18:23:30 (GMT)
commit4ca8ae712c1bf73bf41247aed119a44acc01de03 (patch)
treea31a86941bf1d33c3230bf299fe5458d3f6c0515 /builtin/apply.c
parente2ecd252b5e3c90c211075ba9d1017379782708b (diff)
parent465cf8ce453dc3e266171ece2ea886acd8c7d714 (diff)
downloadgit-4ca8ae712c1bf73bf41247aed119a44acc01de03.zip
git-4ca8ae712c1bf73bf41247aed119a44acc01de03.tar.gz
git-4ca8ae712c1bf73bf41247aed119a44acc01de03.tar.bz2
Merge branch 'tr/do-not-call-submodules-subprojects'
* tr/do-not-call-submodules-subprojects: show-branch: fix description of --date-order apply, entry: speak of submodules instead of subprojects
Diffstat (limited to 'builtin/apply.c')
-rw-r--r--builtin/apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/apply.c b/builtin/apply.c
index ff01ebf..240a05c 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3847,7 +3847,7 @@ static void add_index_file(const char *path, unsigned mode, void *buf, unsigned
const char *s = buf;
if (get_sha1_hex(s + strlen("Subproject commit "), ce->sha1))
- die(_("corrupt patch for subproject %s"), path);
+ die(_("corrupt patch for submodule %s"), path);
} else {
if (!cached) {
if (lstat(path, &st) < 0)