diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-08-12 18:45:14 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-30 20:46:54 -0700 |
| commit | 9047ebbc229bf5b99d6c7522293b8cbd1100b747 (patch) | |
| tree | d5524f2922348d8c7b3b7b3506e32611edc25188 /merge-recursive.h | |
| parent | 7df437e56b5a2c5ec7140dd097b517563db4972c (diff) | |
| download | git-9047ebbc229bf5b99d6c7522293b8cbd1100b747.tar.gz git-9047ebbc229bf5b99d6c7522293b8cbd1100b747.tar.xz | |
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.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index f37630a8a..73e4413a8 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 |