summaryrefslogtreecommitdiff
path: root/include/git2/sys/merge.h
Commit message (Expand)AuthorAgeFilesLines
* merge: Return non-const git_repository from git_merge_driver_source_repo acce...Laurence McGlashan2020-01-151-1/+1
* Introduce GIT_CALLBACK macro to enforce cdeclEdward Thomson2019-01-171-3/+3
* docs: correct defgroupEtienne Samson2018-05-071-1/+1
* docs: fix more missing includesEtienne Samson2018-05-071-0/+5
* merge_driver: fix const-correctness for source gettersPatrick Steinhardt2017-03-151-5/+5
* merge driver: remove `check` callbackEdward Thomson2016-03-171-62/+6
* merge driver: improve inline documentationEdward Thomson2016-03-171-18/+21
* merge driver: introduce custom merge driversEdward Thomson2016-03-171-0/+230