Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
merge-recursive.c: remove implicit dependency on the_index
[gitweb.git]
/
builtin
/
merge-recursive.c
diff --git
a/builtin/merge-recursive.c
b/builtin/merge-recursive.c
index 9b2f707c291cf903b9151c2f3673b6fe0e0ca6d5..4864f7b22f3d11a2b28f0653031ee2f74f946e91 100644
(file)
--- a/
builtin/merge-recursive.c
+++ b/
builtin/merge-recursive.c
@@
-28,7
+28,7
@@
int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
struct merge_options o;
struct commit *result;
- init_merge_options(&o);
+ init_merge_options(&o
, the_repository
);
if (argv[0] && ends_with(argv[0], "-subtree"))
o.subtree_shift = "";