Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Make "empty ident" error message a bit more helpful.
[gitweb.git]
/
merge-index.c
diff --git
a/merge-index.c
b/merge-index.c
index 727527fd59480a11a563108fa5d55a2696a40e98..024196e7ac53cb9ad09b38ea646bad81aff33306 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>*)");
+ setup_git_directory();
read_cache();
i = 1;