61 Commits

Author	SHA1	Message	Date
Arthur Schreiber	31a6118175	Fix two typos in the merge docs.	2013-05-29 00:02:26 +03:00
Edward Thomson	9c06b25054	merge setup	2013-05-17 08:26:24 -05:00
nulltoken	1fed6b07f0	Fix trailing whitespaces	2013-05-15 22:41:30 +02:00
Linquize	0cb16fe924	Unify whitespaces to tabs	2013-05-15 20:26:55 +08:00
Edward Thomson	0462fba538	renames!	2013-04-30 16:01:11 -05:00
Edward Thomson	bec65a5e99	merge!	2013-04-30 15:31:31 -05:00
Edward Thomson	359fc2d241	update copyrights	2013-01-08 17:31:27 -06:00
Ben Straub	eac7695683	Format/documentation tweaks for merge.h	2012-11-27 13:18:29 -08:00
Sascha Cunz	857323d4db	git_mergebase: Constness-Fix for consistency	2012-09-09 15:53:57 +02:00
nulltoken	b46bdb2204	merge: Expose git_merge_base_many()	2012-06-07 16:25:37 +02:00
Carlos Martín Nieto	bf787bd87c	Move git_merge_base() to is own header and document it	2012-04-12 20:25:25 +02:00