projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make index file locking code reusable to others.
[git.git]
/
merge-index.c
diff --git
a/merge-index.c
b/merge-index.c
index
727527f
..
024196e
100644
(file)
--- a/
merge-index.c
+++ b/
merge-index.c
@@
-102,6
+102,7
@@
int main(int argc, char **argv)
if (argc < 3)
usage("git-merge-index [-o] [-q] <merge-program> (-a | <filename>*)");
if (argc < 3)
usage("git-merge-index [-o] [-q] <merge-program> (-a | <filename>*)");
+ setup_git_directory();
read_cache();
i = 1;
read_cache();
i = 1;