diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-22 20:23:30 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-22 20:23:30 +0200 |
| commit | 4ca8ae712c1bf73bf41247aed119a44acc01de03 (patch) | |
| tree | a31a86941bf1d33c3230bf299fe5458d3f6c0515 /builtin/apply.c | |
| parent | Merge branch 'mm/diff-no-patch-synonym-to-s' (diff) | |
| parent | show-branch: fix description of --date-order (diff) | |
| download | git-4ca8ae712c1bf73bf41247aed119a44acc01de03.tar.xz git-4ca8ae712c1bf73bf41247aed119a44acc01de03.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index ff01ebff3d..240a05c2d2 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) |