My Various Git Projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eeff891
)
apply: fix typo in an error message
author
Slavomir Vlcek
<svlc@inventati.org>
Mon, 17 Nov 2014 00:38:26 +0000
(
01:38
+0100)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 17 Nov 2014 17:26:24 +0000
(09:26 -0800)
s/submoule/submodule
Signed-off-by: Slavomir Vlcek <svlc@inventati.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/apply.c
patch
|
blob
|
history
diff --git
a/builtin/apply.c
b/builtin/apply.c
index
ef32e4f
..
c201f0e
100644
(file)
--- 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 submo
d
ule %s",
name);
} else if (!get_sha1_blob(patch->old_sha1_prefix, sha1)) {
; /* ok */