summaryrefslogtreecommitdiff
path: root/src/merge.c
Commit message (Expand)AuthorAgeFilesLines
* Fix some more memory leaks in error pathRémi Duraffort2013-07-151-1/+3
* Reorganize diff and add basic diff driverRussell Belfer2013-06-101-0/+2
* Make iterators use GIT_ITEROVER & smart advanceRussell Belfer2013-05-311-3/+12
* merge setupEdward Thomson2013-05-171-40/+555
* Fix trailing whitespacesnulltoken2013-05-151-164/+163
* Merge pull request #1526 from arrbee/cleanup-error-return-without-msgVicent Martí2013-05-061-1/+2
|\
| * Set error when no merge base is foundRussell Belfer2013-05-011-1/+2
* | puns are not funny; type punning especially soEdward Thomson2013-05-021-6/+16
* | 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
* Rename git_count_ahead_behind -> git_graph_ahead_behindScott J. Goldman2012-11-281-82/+0
* 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
* reset changes for mergeEdward Thomson2012-10-241-0/+48