Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
status: do not report errors in sequencer/todo
[gitweb.git]
/
builtin
/
merge-recursive.c
diff --git
a/builtin/merge-recursive.c
b/builtin/merge-recursive.c
index 7545136c2a6da526ab7998106f2a28bfcbe8bd81..5b910e351e4dede4527d23a04a8294e17ebd371c 100644
(file)
--- a/
builtin/merge-recursive.c
+++ b/
builtin/merge-recursive.c
@@
-29,7
+29,7
@@
int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
char *better1, *better2;
struct commit *result;
- init_merge_options(&o);
+ init_merge_options(&o
, the_repository
);
if (argv[0] && ends_with(argv[0], "-subtree"))
o.subtree_shift = "";