summaryrefslogtreecommitdiff
path: root/include/git2/sys/merge.h
Commit message (Collapse)AuthorAgeFilesLines
* merge: Return non-const git_repository from git_merge_driver_source_repo ↵Laurence McGlashan2020-01-151-1/+1
| | | | accessor.
* Introduce GIT_CALLBACK macro to enforce cdeclEdward Thomson2019-01-171-3/+3
| | | | | | | | | Since we now always build the library with cdecl calling conventions, our callbacks should be decorated as such so that users will not be able to provide callbacks defined with other calling conventions. The `GIT_CALLBACK` macro will inject the `__cdecl` attribute as appropriate.
* 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
| | | | | | Since the `apply` callback can defer, the `check` callback is not necessary. Removing the `check` callback further makes the `payload` unnecessary along with the `cleanup` callback.
* merge driver: improve inline documentationEdward Thomson2016-03-171-18/+21
|
* merge driver: introduce custom merge driversEdward Thomson2016-03-171-0/+230
Consumers can now register custom merged drivers with `git_merge_driver_register`. This allows consumers to support the merge drivers, as configured in `.gitattributes`. Consumers will be asked to perform the file-level merge when a custom driver is configured.