summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-08-12 16:45:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-31 03:46:54 (GMT)
commit9047ebbc229bf5b99d6c7522293b8cbd1100b747 (patch)
treed5524f2922348d8c7b3b7b3506e32611edc25188 /merge-recursive.h
parent7df437e56b5a2c5ec7140dd097b517563db4972c (diff)
downloadgit-9047ebbc229bf5b99d6c7522293b8cbd1100b747.zip
git-9047ebbc229bf5b99d6c7522293b8cbd1100b747.tar.gz
git-9047ebbc229bf5b99d6c7522293b8cbd1100b747.tar.bz2
Split out merge_recursive() to merge-recursive.c
Move most of the of code from builtin-merge-recursive.c to a new file merge-recursive.c and introduce merge_recursive_setup() in there so that builtin-merge-recursive and other builtins call it. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
-rw-r--r--merge-recursive.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/merge-recursive.h b/merge-recursive.h
index f37630a..73e4413 100644
--- 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