7 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
Edward Thomson	eff531e103	Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCE	2014-05-27 20:58:20 -05:00
Edward Thomson	a3622ba6cc	Move GIT_MERGE_CONFIG_* to its own enum	2014-05-27 20:49:20 -05:00
Edward Thomson	d362093f9e	Introduce GIT_MERGE_CONFIG_* for merge.ff settings ... git_merge_analysis will now return GIT_MERGE_CONFIG_NO_FASTFORWARD when merge.ff=false and GIT_MERGE_CONFIG_FASTFORWARD_ONLY when merge.ff=true	2014-05-27 20:49:16 -05:00
Edward Thomson	58c2b1c421	UNBORN implies FAST_FORWARD	2014-03-20 09:35:22 -07:00
Edward Thomson	ac584fcfd3	Introduce GIT_MERGE_ANALYSIS_UNBORN	2014-03-20 09:25:11 -07:00
Edward Thomson	97f3462ae6	git_merge_status -> git_merge_analysis	2014-03-20 09:25:10 -07:00