9 Commits

Author	SHA1	Message	Date
Jacques Germishuys	6fefb7af84	Capture conflict information in MERGE_MSG for revert and merge	2014-04-14 16:16:22 +02:00
Edward Thomson	5aa2ac6de1	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
Ben Straub	aa17c3c63c	git_revert_opts -> git_revert_options	2014-03-06 09:44:52 -08:00
Matthew Bowen	b9f819978c	Added function-based initializers for every options struct. ... The basic structure of each function is courtesy of arrbee.	2014-03-05 21:49:23 -05:00
Edward Thomson	86a05ef382	Validate struct versions in merge, revert	2013-12-12 17:40:40 -05:00
Edward Thomson	5588f07360	Clean up warnings	2013-12-09 11:40:44 -05:00
Edward Thomson	eac938d96e	Bare naked merge and rebase	2013-12-03 10:18:53 -05:00
Edward Thomson	bab0b9f2d2	clean up state metadata more consistently	2013-12-02 16:57:41 -06:00
Edward Thomson	300d192f7e	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00