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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \| \| \|	Following the rest of the series, use 'id' when refering to the value.
*	index: rename an entry's id to 'id'	Carlos Martín Nieto	2014-01-25	6	-9/+9
\| \| \| \|	This was not converted when we converted the rest, so do it now.
*	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
\| \| \| \| \| \| \|	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.
*	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
\| \| \| \| \| \| \| \| \| \| \|	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.
*	refs: remove the _with_log differentiation	Carlos Martín Nieto	2014-01-15	3	-3/+3
\| \| \| \| \| \|	Any well-behaved program should write a descriptive message to the reflog whenever it updates a reference. Let's make this more prominent by removing the version without the reflog parameters.
*	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