Split out merge_recursive() to merge-recursive.c

[thirdparty/git.git] / merge-recursive.h

diff --git a/merge-recursive.h b/merge-recursive.h
index f37630a8ad07709ae106ddde44a34daf6bad8b16..73e4413a8072a90c1da5a466357774e4b5500a58 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -14,7 +14,11 @@ int merge_trees(struct tree *head,
                const char *branch1,
                const char *branch2,
                struct tree **result);
-
+struct commit *make_virtual_commit(struct tree *tree, const char *comment);
+int merge_recursive_config(const char *var, const char *value, void *cb);
+void merge_recursive_setup(int is_subtree_merge);
 struct tree *write_tree_from_memory(void);
 
+extern int merge_recursive_verbosity;
+
 #endif