summaryrefslogtreecommitdiff
path: root/src/merge.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | merge: Warning noiseVicent Marti2013-05-011-1/+1
| |
* | move NAME and REUC extensions to sys/Edward Thomson2013-04-301-0/+1
| |
* | renames!Edward Thomson2013-04-301-1/+484
| |
* | merge!Edward Thomson2013-04-301-3/+843
|/
* update copyrightsEdward Thomson2013-01-081-1/+1
|
* merge cleanup should actually cleanup and the test should actually testEdward Thomson2013-01-061-1/+1
|
* MERGE_HEAD contents iteratorEdward Thomson2013-01-031-0/+53
|
* expose merge metadata cleanupEdward Thomson2013-01-031-1/+1
|
* Fix function name and add real error checkRussell Belfer2012-11-291-4/+4
| | | | | | | `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.
* Rename git_count_ahead_behind -> git_graph_ahead_behindScott J. Goldman2012-11-281-82/+0
| | | | | | 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 *`.
* fix coding style: while( -> while (Scott J. Goldman2012-11-281-1/+1
|
* Add initial implementation of ahead-behind countScott J. Goldman2012-11-281-0/+81
|
* Move merge functions to merge.cBen Straub2012-11-271-0/+196
| | | | | In so doing, promote commit_list to git_commit_list, with its own internal API header.
* reset changes for mergeEdward Thomson2012-10-241-0/+48