Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'en/apply-comment-fix'
author
Junio C Hamano
<gitster@pobox.com>
Tue, 24 Jul 2018 21:50:43 +0000
(14:50 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 24 Jul 2018 21:50:43 +0000
(14:50 -0700)
* en/apply-comment-fix:
apply: fix grammar error in comment
1
2
apply.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
compact
(merge:
0ce5a69
59caaca
)
diff --combined
apply.c
index 23a0f25ded853c29c3a6e891399dc5c1c2d8a753,9ee41ff3eb0b2d916c819e9c6b8d98d3f010a194..49752cde44df6f0853051abacf8546ab92ee4d7a
---
1
/
apply.c
---
2
/
apply.c
+++ b/
apply.c
@@@
-9,7
-9,6
+9,7
@@@
#include "cache.h"
#include "config.h"
+#include "object-store.h"
#include "blob.h"
#include "delta.h"
#include "diff.h"
@@@
-4056,7
-4055,7
+4056,7
@@@
static int preimage_oid_in_gitlink_patc
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;