Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
apply: fix grammar error in comment
author
Elijah Newren
<newren@gmail.com>
Thu, 7 Jun 2018 05:05:25 +0000
(22:05 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 28 Jun 2018 20:27:57 +0000
(13:27 -0700)
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
apply.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
e333175
)
diff --git
a/apply.c
b/apply.c
index 959c45791008214cbc971493afaeb5f0e761f486..9ee41ff3eb0b2d916c819e9c6b8d98d3f010a194 100644
(file)
--- a/
apply.c
+++ b/
apply.c
@@
-4055,7
+4055,7
@@
static int preimage_oid_in_gitlink_patch(struct patch *p, struct object_id *oid)
return get_oid_hex(p->old_sha1_prefix, oid);
}
return get_oid_hex(p->old_sha1_prefix, oid);
}
-/* Build an index that contains
the
just the files needed for a 3way merge */
+/* Build an index that contains just the files needed for a 3way merge */
static int build_fake_ancestor(struct apply_state *state, struct patch *list)
{
struct patch *patch;
static int build_fake_ancestor(struct apply_state *state, struct patch *list)
{
struct patch *patch;