delta/libgit2.git - github.com: libgit2/libgit2.git

	Commit message (Expand)	Author	Age	Files	Lines
*	recursive merge: add a recursion limit	Edward Thomson	2015-11-25	1	-0/+31
*	merge: handle conflicts in recursive base building	Edward Thomson	2015-11-25	1	-0/+80
*	merge tests: add complex recursive example	Edward Thomson	2015-11-25	1	-0/+28
*	merge tests: move expected data into own file	Edward Thomson	2015-11-25	2	-1/+3
*	merge: add recursive test with conflicting contents	Edward Thomson	2015-11-25	1	-0/+23
*	merge: add recursive test with three merge bases	Edward Thomson	2015-11-25	1	-0/+46
*	merge: improve test names in recursive merge tests	Edward Thomson	2015-11-25	1	-8/+8
*	merge: add a third-level recursive merge	Edward Thomson	2015-11-25	1	-0/+46
*	merge: add a second-level recursive merge	Edward Thomson	2015-11-25	1	-2/+48
*	merge: add simple recursive test	Edward Thomson	2015-11-25	1	-0/+110
*	merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`	Edward Thomson	2015-11-25	2	-2/+2
*	merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT	Edward Thomson	2015-10-22	1	-1/+17
*	iterator: use an options struct instead of args	Edward Thomson	2015-08-28	1	-6/+6
*	introduce `git_index_entry_is_conflict`	Edward Thomson	2015-05-28	1	-1/+1
*	merge: merge iterators	Edward Thomson	2015-05-11	1	-1/+13
*	Collapse whitespace flags into git_merge_file_flags_t	Jacques Germishuys	2015-03-16	1	-2/+2
*	Renamed git_merge_options 'flags' to 'tree_flags'	Jacques Germishuys	2015-03-16	1	-1/+1
*	Added tests to merge files and branches with whitespace problems and fixes	Jacques Germishuys	2015-03-16	1	-0/+82
*	hashsig: Export as a `sys` headervmg/hashsig	Vicent Marti	2014-10-01	1	-1/+1
*	Introduce cl_assert_equal_oid	Edward Thomson	2014-07-01	1	-1/+1
*	Update git_merge_tree_opts to git_merge_options	Edward Thomson	2014-03-20	5	-11/+11
*	Introduce git_merge_file for consumers	Edward Thomson	2014-03-20	2	-33/+0
*	index: rename an entry's id to 'id'	Carlos Martín Nieto	2014-01-25	3	-4/+4
*	Remove the "merge none" flag	Edward Thomson	2014-01-20	1	-105/+14
*	merge_file should use more aggressive levels	Edward Thomson	2014-01-20	2	-3/+3
*	Clean up warnings	Edward Thomson	2013-12-09	1	-22/+0
*	Bare naked merge and rebase	Edward Thomson	2013-12-03	1	-0/+164
*	Rename tests-clar to tests	Ben Straub	2013-11-14	5	-0/+1467