19 Commits

Author	SHA1	Message	Date
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
Vicent Martí	03c28d92d0	Merge pull request #1526 from arrbee/cleanup-error-return-without-msg ... Make sure error messages are set for most error returns	2013-05-06 06:45:53 -07:00
Edward Thomson	4e7c15608f	puns are not funny; type punning especially so	2013-05-02 14:58:40 -05:00
Russell Belfer	de19c4a958	Set error when no merge base is found	2013-05-01 14:00:20 -07:00
Vicent Marti	e1807113c4	merge: Warning noise	2013-05-01 15:31:23 +02:00
Edward Thomson	75d1c8c664	move NAME and REUC extensions to sys/	2013-04-30 17:33:11 -05: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
Edward Thomson	c31ae146b4	merge cleanup should actually cleanup and the test should actually test	2013-01-06 18:38:29 -06:00
Edward Thomson	42e50b5ed1	MERGE_HEAD contents iterator	2013-01-03 16:35:59 -06:00
Edward Thomson	ad2bc32fa3	expose merge metadata cleanup	2013-01-03 15:53:50 -06:00
Russell Belfer	d5e44d8498	Fix function name and add real error check ... `revwalk.h:commit_lookup()` -> `git_revwalk__commit_lookup()` and make `git_commit_list_parse()` do real error checking that the item in the list is an actual commit object. Also fixed an apparent typo in a test name.	2012-11-29 17:02:27 -08:00
Scott J. Goldman	0984c8768d	Rename git_count_ahead_behind -> git_graph_ahead_behind ... Moved it into graph.{c,h} which i created for the new "graph" functions namespace. Also adjusted the function prototype to use `size_t` and `const git_oid *`.	2012-11-28 18:54:57 -08:00
Scott J. Goldman	c6d03c958f	fix coding style: while( -> while (	2012-11-28 18:54:57 -08:00
Scott J. Goldman	bff53e5405	Add initial implementation of ahead-behind count	2012-11-28 18:54:56 -08:00
Ben Straub	4ff192d3f2	Move merge functions to merge.c ... In so doing, promote commit_list to git_commit_list, with its own internal API header.	2012-11-27 13:18:29 -08:00
Edward Thomson	632d8b230b	reset changes for merge	2012-10-24 20:24:37 -05:00