projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Add the simple scripts I used to do a merge with content conflicts.
[git.git]
/
read-tree.c
diff --git
a/read-tree.c
b/read-tree.c
index
c4ca86f
..
f507f16
100644
(file)
--- a/
read-tree.c
+++ b/
read-tree.c
@@
-15,7
+15,7
@@
static int read_one_entry(unsigned char *sha1, const char *base, int baselen, co
memset(ce, 0, size);
- ce->ce_mode =
htonl
(mode);
+ ce->ce_mode =
create_ce_mode
(mode);
ce->ce_flags = create_ce_flags(baselen + len, stage);
memcpy(ce->name, base, baselen);
memcpy(ce->name + baselen, pathname, len+1);