- 17 Mar, 2016 4 commits
-
-
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.
Edward Thomson committed -
Edward Thomson committed
-
Allow merge users to configure a custom default merge driver via `git_merge_options`. Similarly, honor the `merge.default` configuration option.
Edward Thomson committed -
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.
Edward Thomson committed
-
- 25 Nov, 2015 1 commit
-
-
Edward Thomson committed
-
- 11 May, 2015 1 commit
-
-
Edward Thomson committed
-
- 16 Mar, 2015 1 commit
-
-
Jeff Hostetler committed
-
- 27 Oct, 2014 1 commit
-
-
Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.
Edward Thomson committed
-
- 01 Jul, 2014 1 commit
-
-
git_checkout_index can now check out other git_index's (that are not necessarily the repository index). This allows checkout_index to use the repository's index for stat cache information instead of the index data being checked out. git_merge and friends now check out their indexes directly instead of trying to blend it into the running index.
Edward Thomson committed
-
- 14 Apr, 2014 1 commit
-
-
Jacques Germishuys committed
-
- 20 Mar, 2014 3 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
Edward Thomson committed
-
- 20 Jan, 2014 1 commit
-
-
Edward Thomson committed
-
- 02 Dec, 2013 1 commit
-
-
Edward Thomson committed
-
- 05 Nov, 2013 2 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
- 17 May, 2013 1 commit
-
-
Edward Thomson committed
-
- 15 May, 2013 2 commits
- 30 Apr, 2013 1 commit
-
-
Edward Thomson committed
-
- 08 Jan, 2013 1 commit
-
-
Edward Thomson committed
-
- 04 Jan, 2013 2 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
- 03 Jan, 2013 2 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
- 27 Nov, 2012 1 commit
-
-
In so doing, promote commit_list to git_commit_list, with its own internal API header.
Ben Straub committed
-
- 25 Oct, 2012 1 commit
-
-
Edward Thomson committed
-