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

	Commit message (Expand)	Author	Age	Files	Lines
*	Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCE	Edward Thomson	2014-05-27	1	-18/+18
*	Move GIT_MERGE_CONFIG_* to its own enum	Edward Thomson	2014-05-27	1	-31/+38
*	Introduce GIT_MERGE_CONFIG_* for merge.ff settings	Edward Thomson	2014-05-27	1	-0/+26
*	merge: checkout default shouldn't clobber given	Edward Thomson	2014-04-23	2	-10/+11
*	merge: default checkout strategy for should be SAFE	Edward Thomson	2014-04-23	1	-0/+17
*	Capture conflict information in MERGE_MSG for revert and merge	Jacques Germishuys	2014-04-14	1	-1/+9
*	Introduce git_merge_head_id	Edward Thomson	2014-03-31	1	-0/+27
*	UNBORN implies FAST_FORWARD	Edward Thomson	2014-03-20	1	-1/+2
*	Introduce GIT_MERGE_ANALYSIS_UNBORN	Edward Thomson	2014-03-20	1	-4/+20
*	git_merge_status -> git_merge_analysis	Edward Thomson	2014-03-20	1	-22/+23
*	Remove `git_merge_result` as it's now unnecessary	Edward Thomson	2014-03-20	8	-122/+34
*	Update git_merge_tree_opts to git_merge_options	Edward Thomson	2014-03-20	10	-25/+25
*	Change signature of `git_merge` to take merge and checkout opts	Edward Thomson	2014-03-20	8	-45/+45
*	Remove fastforward / uptodate from `git_merge`	Edward Thomson	2014-03-20	1	-77/+47
*	Add `git_merge_status` to provide info about an upcoming merge	Edward Thomson	2014-03-20	2	-148/+89
*	Introduce git_merge_file for consumers	Edward Thomson	2014-03-20	5	-74/+218
*	git_checkout_opts -> git_checkout_options	Ben Straub	2014-03-06	2	-2/+2
*	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	6	-9/+9
*	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	2	-195/+28
*	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	4	-11/+11
*	refs: remove the _with_log differentiation	Carlos Martín Nieto	2014-01-15	3	-3/+3
*	Clean up warnings	Edward Thomson	2013-12-09	2	-23/+0
*	Bare naked merge and rebase	Edward Thomson	2013-12-03	3	-0/+197
*	Rename tests-clar to tests	Ben Straub	2013-11-14	12	-0/+4055