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

	Commit message (Expand)	Author	Age	Files	Lines
*	Free temporary merge index	Edward Thomson	2014-03-26	1	-2/+1
*	Merge pull request #2183 from ethomson/merge_refactor	Vicent Marti	2014-03-24	1	-205/+195
\|\
\| *	UNBORN implies FAST_FORWARD	Edward Thomson	2014-03-20	1	-1/+1
\| *	Introduce GIT_MERGE_ANALYSIS_UNBORN	Edward Thomson	2014-03-20	1	-10/+25
\| *	git_merge_status -> git_merge_analysis	Edward Thomson	2014-03-20	1	-5/+5
\| *	Remove `git_merge_result` as it's now unnecessary	Edward Thomson	2014-03-20	1	-47/+1
\| *	Update git_merge_tree_opts to git_merge_options	Edward Thomson	2014-03-20	1	-24/+24
\| *	Change signature of `git_merge` to take merge and checkout opts	Edward Thomson	2014-03-20	1	-38/+26
\| *	Remove fastforward / uptodate from `git_merge`	Edward Thomson	2014-03-20	1	-82/+23
\| *	Add `git_merge_status` to provide info about an upcoming merge	Edward Thomson	2014-03-20	1	-9/+74
\| *	Introduce git_merge_file for consumers	Edward Thomson	2014-03-20	1	-14/+41
* \|	revwalk: don't try to find merge bases when there can be none	Carlos Martín Nieto	2014-03-20	1	-0/+6
\|/
*	Implement git_merge_base_octopus	Aimeast	2014-03-18	1	-0/+25
*	Added function-based initializers for every options struct.	Matthew Bowen	2014-03-05	1	-0/+24
*	Address PR comments	Russell Belfer	2014-02-20	1	-1/+1
*	Merge pull request #2100 from libgit2/rb/update-pqueue	Vicent Marti	2014-02-07	1	-7/+8
\|\
\| *	Replace pqueue with code from hashsig heap	Russell Belfer	2014-02-03	1	-7/+8
* \|	Remove unused pointer assignment	Edward Thomson	2014-02-03	1	-1/+1
* \|	Merge wd validation tests against index not HEAD	Edward Thomson	2014-02-03	1	-6/+3
\|/
*	Two-phase index merging	Edward Thomson	2014-01-29	1	-5/+14
*	merge: rename _oid() -> id()	Carlos Martín Nieto	2014-01-25	1	-3/+3
*	diff: rename the file's 'oid' to 'id'	Carlos Martín Nieto	2014-01-25	1	-1/+1
*	index: rename an entry's id to 'id'	Carlos Martín Nieto	2014-01-25	1	-13/+13
*	Merge submodules	Edward Thomson	2014-01-20	1	-4/+10
*	Remove the "merge none" flag	Edward Thomson	2014-01-20	1	-11/+6
*	Introduce diff3 mode for checking out conflicts	Edward Thomson	2014-01-20	1	-5/+19
*	Don't try to merge binary files	Edward Thomson	2014-01-20	1	-0/+43
*	merge_file should use more aggressive levels	Edward Thomson	2014-01-20	1	-7/+10
*	Merge pull request #1986 from libgit2/rb/error-handling-cleanups	Vicent Marti	2013-12-13	1	-19/+11
\|\
\| *	Cleanups, renames, and leak fixes	Russell Belfer	2013-12-12	1	-1/+1
\| *	One more rename/cleanup for callback err functions	Russell Belfer	2013-12-11	1	-1/+1
\| *	Some callback error check style cleanups	Russell Belfer	2013-12-11	1	-1/+3
\| *	Remove converting user error to GIT_EUSER	Russell Belfer	2013-12-11	1	-3/+1
\| *	Add git_vector_free_all	Russell Belfer	2013-12-11	1	-5/+1
\| *	Further EUSER and error propagation fixes	Russell Belfer	2013-12-11	1	-2/+3
\| *	Add config read fns with controlled error behavior	Russell Belfer	2013-12-11	1	-11/+6
* \|	Validate struct versions in merge, revert	Edward Thomson	2013-12-12	1	-0/+4
\|/
*	Clean up warnings	Edward Thomson	2013-12-09	1	-2/+2
*	Bare naked merge and rebase	Edward Thomson	2013-12-03	1	-0/+34
*	clean up state metadata more consistently	Edward Thomson	2013-12-02	1	-34/+12
*	Introduce git_revert to revert a single commit	Edward Thomson	2013-12-02	1	-8/+10
*	Fix warnings	Russell Belfer	2013-11-13	1	-1/+3
*	Plug git_merge() related leaks	nulltoken	2013-11-05	1	-0/+1
*	merge branch into current, updating workdir	Edward Thomson	2013-11-05	1	-18/+525
*	move mode_t to filebuf_open instead of _commit	Edward Thomson	2013-11-04	1	-8/+8
*	merge: any non-zero return from the user is an error	Carlos Martín Nieto	2013-10-30	1	-1/+1
*	merge: reverse array and length parameter order	Carlos Martín Nieto	2013-09-22	1	-1/+1
*	Fix some more memory leaks in error path	Rémi Duraffort	2013-07-15	1	-1/+3
*	Reorganize diff and add basic diff driver	Russell Belfer	2013-06-10	1	-0/+2
*	Make iterators use GIT_ITEROVER & smart advance	Russell Belfer	2013-05-31	1	-3/+12