16 Commits

Author	SHA1	Message	Date
Edward Thomson	d9fdee6e4c	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -07:00
Edward Thomson	5aa2ac6de1	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
Edward Thomson	1c0b6a38ba	Remove fastforward / uptodate from git_merge	2014-03-20 09:25:06 -07:00
Edward Thomson	6b92c99bcb	Don't try to merge binary files	2014-01-20 17:15:12 -05:00
Edward Thomson	300d192f7e	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00
Edward Thomson	039db728f3	merge branch into current, updating workdir	2013-11-05 10:00:39 -05:00
Edward Thomson	1d3a8aeb4b	move mode_t to filebuf_open instead of _commit	2013-11-04 22:33:05 -05:00
Edward Thomson	9c06b25054	merge setup	2013-05-17 08:26:24 -05:00
nulltoken	1fed6b07f0	Fix trailing whitespaces	2013-05-15 22:41:30 +02:00
Linquize	0cb16fe924	Unify whitespaces to tabs	2013-05-15 20:26:55 +08:00
Edward Thomson	bec65a5e99	merge!	2013-04-30 15:31:31 -05:00
Edward Thomson	359fc2d241	update copyrights	2013-01-08 17:31:27 -06:00
Edward Thomson	42e50b5ed1	MERGE_HEAD contents iterator	2013-01-03 16:35:59 -06:00
Edward Thomson	ad2bc32fa3	expose merge metadata cleanup	2013-01-03 15:53:50 -06:00
Ben Straub	4ff192d3f2	Move merge functions to merge.c ... In so doing, promote commit_list to git_commit_list, with its own internal API header.	2012-11-27 13:18:29 -08:00
Edward Thomson	632d8b230b	reset changes for merge	2012-10-24 20:24:37 -05:00