projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Document git-merge-cache -o
[git.git]
/
read-tree.c
diff --git
a/read-tree.c
b/read-tree.c
index
604884a
..
f8dc509
100644
(file)
--- a/
read-tree.c
+++ b/
read-tree.c
@@
-191,7
+191,7
@@
int main(int argc, char **argv)
merge = 1;
continue;
}
- if (get_sha1
_hex
(arg, sha1) < 0)
+ if (get_sha1(arg, sha1) < 0)
usage(read_tree_usage);
if (stage > 3)
usage(read_tree_usage);