6 Commits

Author	SHA1	Message	Date
Edward Thomson	18b00406c6	s/git_merge_head/git_annotated_commit ... Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.	2014-10-26 22:59:48 -04:00
Sven Strickroth	b8add6c42e	Allow to propagate checkout callbacks to git HARD reset ... Signed-off-by: Sven Strickroth <email@cs-ware.de>	2014-08-03 16:29:51 +02:00
Edward Thomson	d9fdee6e4c	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -07:00
Edward Thomson	02105a27f0	Change signature of git_merge to take merge and checkout opts	2014-03-20 09:25:07 -07:00
Ben Straub	586be3b889	Add reflog parameters to git_reset	2014-02-03 15:05:55 -08:00
Edward Thomson	0ef19fe14c	Merge submodules	2014-01-20 18:07:17 -05:00