Method
GgitRepositorymerge_commits
Declaration [src]
GgitIndex*
ggit_repository_merge_commits (
GgitRepository* repository,
GgitCommit* our_commit,
GgitCommit* their_commit,
GgitMergeOptions* merge_options,
GError** error
)
Parameters
our_commit-
Type:
GgitCommitThe commit that reflects the destination tree.
The data is owned by the caller of the function. their_commit-
Type:
GgitCommitThe commit that reflects the source tree.
The data is owned by the caller of the function. merge_options-
Type:
GgitMergeOptionsThe merge options.
The data is owned by the caller of the function. error-
Type:
GError **The return location for a recoverable error.
The argument can be NULL.If the return location is not NULL, then you must initialize it to aNULLGError*.The argument will left initialized to NULLby the method if there are no errors.In case of error, the argument will be set to a newly allocated GError; the caller will take ownership of the data, and be responsible for freeing it.
Return value
Type: GgitIndex
A new GgitIndex or NULL if an error occurred.
| The caller of the method takes ownership of the data, and is responsible for freeing it. |
The return value can be NULL. |