summaryrefslogtreecommitdiff
path: root/src/merge.c
Commit message (Expand)AuthorAgeFilesLines
...
| * Remove converting user error to GIT_EUSERRussell Belfer2013-12-111-3/+1
| * Add git_vector_free_allRussell Belfer2013-12-111-5/+1
| * Further EUSER and error propagation fixesRussell Belfer2013-12-111-2/+3
| * Add config read fns with controlled error behaviorRussell Belfer2013-12-111-11/+6
* | Validate struct versions in merge, revertEdward Thomson2013-12-121-0/+4
|/
* Clean up warningsEdward Thomson2013-12-091-2/+2
* Bare naked merge and rebaseEdward Thomson2013-12-031-0/+34
* clean up state metadata more consistentlyEdward Thomson2013-12-021-34/+12
* Introduce git_revert to revert a single commitEdward Thomson2013-12-021-8/+10
* Fix warningsRussell Belfer2013-11-131-1/+3
* Plug git_merge() related leaksnulltoken2013-11-051-0/+1
* merge branch into current, updating workdirEdward Thomson2013-11-051-18/+525
* move mode_t to filebuf_open instead of _commitEdward Thomson2013-11-041-8/+8
* merge: any non-zero return from the user is an errorCarlos Martín Nieto2013-10-301-1/+1
* merge: reverse array and length parameter orderCarlos Martín Nieto2013-09-221-1/+1
* 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