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

#ifndef MERGE_RECURSIVE_H
#define MERGE_RECURSIVE_H

int merge_recursive(struct commit *h1,
		    struct commit *h2,
		    const char *branch1,
		    const char *branch2,
		    struct commit_list *ancestors,
		    struct commit **result);

int merge_trees(struct tree *head,
		struct tree *merge,
		struct tree *common,
		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
Commit	Line	Data
e1b3a2ca DB	1	#ifndef MERGE_RECURSIVE_H
	2	#define MERGE_RECURSIVE_H
	3
	4	int merge_recursive(struct commit *h1,
	5	struct commit *h2,
	6	const char *branch1,
	7	const char *branch2,
	8	struct commit_list *ancestors,
	9	struct commit **result);
	10
	11	int merge_trees(struct tree *head,
	12	struct tree *merge,
	13	struct tree *common,
	14	const char *branch1,
	15	const char *branch2,
	16	struct tree **result);
9047ebbc MV	17	struct commit make_virtual_commit(struct tree tree, const char *comment);
	18	int merge_recursive_config(const char var, const char value, void *cb);
	19	void merge_recursive_setup(int is_subtree_merge);
e1b3a2ca DB	20	struct tree *write_tree_from_memory(void);
e1b3a2ca DB	21
9047ebbc MV	22	extern int merge_recursive_verbosity;
9047ebbc MV	23
e1b3a2ca	24	#endif