github.com/mono/libgit2.git - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Collapse)	Author
2014-03-06	git_revert_opts -> git_revert_optionsoptions-names	Ben Straub

2014-02-06	More merge.conflictstyle fixes	Ben Straub

2014-02-04	Add reflog parameters to git_reset	Ben Straub

2014-01-21	Remove the "merge none" flag	Edward Thomson
	The "merge none" (don't automerge) flag was only to aide in merge trivial tests. We can easily determine whether merge trivial resulted in a trivial merge or an automerge by examining the REUC after automerge has completed.
2014-01-21	merge_file should use more aggressive levels	Edward Thomson
	The default merge_file level was XDL_MERGE_MINIMAL, which will produce conflicts where there should not be in the case where both sides were changed identically. Change the defaults to be more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively compress non-conflicts. This matches git.git's defaults. Increase testing around reverting a previously reverted commit to illustrate this problem.
2013-12-03	Reorder var decls in revert test	Edward Thomson
	Oh, MSVC.
2013-12-03	Bare naked merge and rebase	Edward Thomson

2013-12-03	Introduce git_revert to revert a single commit	Edward Thomson