summaryrefslogtreecommitdiff
path: root/include/git2/merge.h
Commit message (Expand)AuthorAgeFilesLines
* merge branch into current, updating workdirEdward Thomson2013-11-051-0/+60
* merge: reverse array and length parameter orderCarlos Martín Nieto2013-09-221-3/+3
* fixes issues with objective-gitJohn Josef2013-09-081-5/+5
* Fixed most documentation header bugsAndreas Linde2013-06-241-1/+1
* Fix two typos in the merge docs.Arthur Schreiber2013-05-291-2/+2
* merge setupEdward Thomson2013-05-171-4/+55
* Fix trailing whitespacesnulltoken2013-05-151-4/+4
* Unify whitespaces to tabsLinquize2013-05-151-1/+1
* renames!Edward Thomson2013-04-301-0/+13
* merge!Edward Thomson2013-04-301-5/+59
* update copyrightsEdward Thomson2013-01-081-1/+1
* Format/documentation tweaks for merge.hBen Straub2012-11-271-2/+12
* git_mergebase: Constness-Fix for consistencySascha Cunz2012-09-091-1/+1
* merge: Expose git_merge_base_many()nulltoken2012-06-071-0/+10
* Move git_merge_base() to is own header and document itCarlos Martín Nieto2012-04-121-0/+35