Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 52cb2bc28b8336a3f2259bb1c6ad2b99c3caca9c authored by Junio C Hamano on 14 June 2008, 19:57:18 UTC, committed by Junio C Hamano on 14 June 2008, 21:39:22 UTC 
GIT 1.5.6-rc3
 
Just a lot of small fixes, mostly documentation.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent c529d75
Raw File
Tip revision: 52cb2bc28b8336a3f2259bb1c6ad2b99c3caca9c authored by Junio C Hamano on 14 June 2008, 19:57:18 UTC
GIT 1.5.6-rc3
Tip revision: 52cb2bc
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 tree *write_tree_from_memory(void);

#endif
back to top