| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge driver: remove `check` callback | Edward Thomson | 2016-03-17 | 1 | -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 documentation | Edward Thomson | 2016-03-17 | 1 | -18/+21 |
| | | |||||
| * | merge driver: introduce custom merge drivers | Edward Thomson | 2016-03-17 | 1 | -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. | |||||
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |