summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Slavomir Vlcek <svlc@inventati.org>2014-11-17 01:38:26 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-11-17 09:26:24 -0800
commitbcd46becbc115f8a1a9bfe3f83efa462547aa231 (patch)
tree2744ff06c01d915e0f47135d595ee042ec7db5e8
parentgit-tag.txt: Add a missing hyphen to `-s` (diff)
downloadtgif-bcd46becbc115f8a1a9bfe3f83efa462547aa231.tar.xz
apply: fix typo in an error message
s/submoule/submodule Signed-off-by: Slavomir Vlcek <svlc@inventati.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/apply.c b/builtin/apply.c
index ef32e4f624..c201f0e6b0 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3662,7 +3662,7 @@ static void build_fake_ancestor(struct patch *list, const char *filename)
if (!preimage_sha1_in_gitlink_patch(patch, sha1))
; /* ok, the textual part looks sane */
else
- die("sha1 information is lacking or useless for submoule %s",
+ die("sha1 information is lacking or useless for submodule %s",
name);
} else if (!get_sha1_blob(patch->old_sha1_prefix, sha1)) {
; /* ok */