delta/libgit2.git - github.com: libgit2/libgit2.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	merge_driver: fix missing `goto done;`	Patrick Steinhardt	2016-04-01	1	-0/+1
\| \| \| \| \| \| \| \| \| \|	The code initializing the merge driver registry accidentally forgot a `goto done` in case of an error. Because of this the next line, which registers the global shutdown callback for the merge drivers, is only called when an error occured. Fix this by adding the missing `goto done`. This fixes some memory leaks when the global state is shut down.
*	merge driver: remove `check` callback	Edward Thomson	2016-03-17	1	-91/+30
\| \| \| \| \| \|	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: correct global initialization	Edward Thomson	2016-03-17	1	-63/+113
\|
*	merge driver: get a pointer to favor	Edward Thomson	2016-03-17	1	-3/+8
\|
*	merge driver: correct indentation	Edward Thomson	2016-03-17	1	-17/+17
\|
*	merge driver: allow custom default driver	Edward Thomson	2016-03-17	1	-36/+35
\| \| \| \| \| \|	Allow merge users to configure a custom default merge driver via `git_merge_options`. Similarly, honor the `merge.default` configuration option.
*	merge driver: introduce custom merge drivers	Edward Thomson	2016-03-17	1	-0/+403
	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.