delta/gitano/libgit2.git - git.gitano.org.uk: libgit2.git

	Commit message (Expand)	Author	Age	Files	Lines
*	Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCE	Edward Thomson	2014-05-27	1	-6/+7
*	Move GIT_MERGE_CONFIG_* to its own enum	Edward Thomson	2014-05-27	1	-3/+11
*	Introduce GIT_MERGE_CONFIG_* for merge.ff settings	Edward Thomson	2014-05-27	1	-0/+12
*	Fixed miscellaneous documentation errors.	Michael Anderson	2014-05-23	1	-5/+5
*	Doc fixes	Russell Belfer	2014-05-02	1	-2/+2
*	Make init_options fns use unsigned ints and macro	Russell Belfer	2014-05-02	1	-3/+3
*	Const correctness!	Jacques Germishuys	2014-04-03	1	-1/+1
*	Const up members of git_merge_file_result	Edward Thomson	2014-03-31	1	-2/+2
*	Introduce git_merge_head_id	Edward Thomson	2014-03-31	1	-0/+9
*	UNBORN implies FAST_FORWARD	Edward Thomson	2014-03-20	1	-2/+2
*	Introduce GIT_MERGE_ANALYSIS_UNBORN	Edward Thomson	2014-03-20	1	-0/+7
*	git_merge_status -> git_merge_analysis	Edward Thomson	2014-03-20	1	-10/+13
*	Remove `git_merge_result` as it's now unnecessary	Edward Thomson	2014-03-20	1	-60/+4
*	Update git_merge_tree_opts to git_merge_options	Edward Thomson	2014-03-20	1	-13/+13
*	Change signature of `git_merge` to take merge and checkout opts	Edward Thomson	2014-03-20	1	-28/+4
*	Remove fastforward / uptodate from `git_merge`	Edward Thomson	2014-03-20	1	-27/+1
*	Add `git_merge_status` to provide info about an upcoming merge	Edward Thomson	2014-03-20	1	-0/+40
*	Introduce git_merge_file for consumers	Edward Thomson	2014-03-20	1	-0/+169
*	Implement git_merge_base_octopus	Aimeast	2014-03-18	1	-1/+16
*	git_checkout_opts -> git_checkout_options	Ben Straub	2014-03-06	1	-2/+2
*	Revert pull request #1997	Vicent Marti	2014-03-06	1	-1/+1
*	Merge pull request #1997 from mgbowen/merge-options-init-fix	Vicent Marti	2014-03-06	1	-1/+1
\|\
\| *	Fix GIT_MERGE_OPTS_INIT on MSVC.	Matthew Bowen	2013-12-09	1	-1/+1
* \|	Added function-based initializers for every options struct.	Matthew Bowen	2014-03-05	1	-0/+24
* \|	Improve documentation for merging	Edward Thomson	2014-02-21	1	-33/+127
* \|	merge: rename _oid() -> id()	Carlos Martín Nieto	2014-01-25	1	-4/+4
* \|	Support union merges	Edward Thomson	2014-01-20	1	-0/+3
* \|	Remove the "merge none" flag	Edward Thomson	2014-01-20	1	-5/+2
* \|	merge_file should use more aggressive levels	Edward Thomson	2014-01-20	1	-7/+14
\|/
*	Bare naked merge and rebase	Edward Thomson	2013-12-03	1	-0/+20
*	merge branch into current, updating workdir	Edward Thomson	2013-11-05	1	-0/+60
*	merge: reverse array and length parameter order	Carlos Martín Nieto	2013-09-22	1	-3/+3
*	fixes issues with objective-git	John Josef	2013-09-08	1	-5/+5
*	Fixed most documentation header bugs	Andreas Linde	2013-06-24	1	-1/+1
*	Fix two typos in the merge docs.	Arthur Schreiber	2013-05-29	1	-2/+2
*	merge setup	Edward Thomson	2013-05-17	1	-4/+55
*	Fix trailing whitespaces	nulltoken	2013-05-15	1	-4/+4
*	Unify whitespaces to tabs	Linquize	2013-05-15	1	-1/+1
*	renames!	Edward Thomson	2013-04-30	1	-0/+13
*	merge!	Edward Thomson	2013-04-30	1	-5/+59
*	update copyrights	Edward Thomson	2013-01-08	1	-1/+1
*	Format/documentation tweaks for merge.h	Ben Straub	2012-11-27	1	-2/+12
*	git_mergebase: Constness-Fix for consistency	Sascha Cunz	2012-09-09	1	-1/+1
*	merge: Expose git_merge_base_many()	nulltoken	2012-06-07	1	-0/+10
*	Move git_merge_base() to is own header and document it	Carlos Martín Nieto	2012-04-12	1	-0/+35