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

	Commit message (Expand)	Author	Age	Files	Lines
...
*	git_checkout_opts -> git_checkout_options	Ben Straub	2014-03-06	1	-1/+1
*	Prevent user's merge.conflictstyle from breaking tests	Ben Straub	2014-02-05	2	-0/+14
*	Fix a few references to changed function signatures	Ben Straub	2014-02-05	1	-3/+3
*	Merge remote-tracking branch 'libgit2/development' into bs/more-reflog-stuff	Ben Straub	2014-02-05	1	-0/+322
\|\
\| *	Test that emulates a strange filter implementation	Edward Thomson	2014-02-03	1	-0/+70
\| *	Tests merging staged files identical to result	Edward Thomson	2014-02-03	1	-0/+70
\| *	Tests merge when changes exist in workdir/index	Edward Thomson	2014-02-03	1	-0/+182
* \|	Add reflog parameters to git_reset	Ben Straub	2014-02-03	2	-4/+4
\|/
*	merge: rename _oid() -> id()	Carlos Martín Nieto	2014-01-25	3	-49/+49
*	index: rename an entry's id to 'id'	Carlos Martín Nieto	2014-01-25	2	-3/+3
*	Merge submodules	Edward Thomson	2014-01-20	1	-0/+101
*	Support union merges	Edward Thomson	2014-01-20	1	-0/+43
*	Remove the "merge none" flag	Edward Thomson	2014-01-20	1	-90/+14
*	Load merge.conflictstyle setting from config	Edward Thomson	2014-01-20	1	-0/+86
*	Introduce diff3 mode for checking out conflicts	Edward Thomson	2014-01-20	1	-1/+48
*	Don't try to merge binary files	Edward Thomson	2014-01-20	1	-0/+37
*	merge_file should use more aggressive levels	Edward Thomson	2014-01-20	2	-8/+8
*	refs: remove the _with_log differentiation	Carlos Martín Nieto	2014-01-15	2	-2/+2
*	Rename tests-clar to tests	Ben Straub	2013-11-14	5	-0/+2193