summaryrefslogtreecommitdiff
path: root/include/git2/merge.h
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@microsoft.com>2014-03-30 19:56:18 -0700
committerEdward Thomson <ethomson@edwardthomson.com>2014-03-31 11:43:38 -0500
commit976634c4672f3e1144b8f11c6c984157a28f5d98 (patch)
tree7ef3b50b69f97777aad55c3f5f1569e1ce58fe7e /include/git2/merge.h
parent7b445c2195f1fff455d13218851fc683f5dd4058 (diff)
downloadlibgit2-976634c4672f3e1144b8f11c6c984157a28f5d98.tar.gz
Introduce git_merge_head_id
Diffstat (limited to 'include/git2/merge.h')
-rw-r--r--include/git2/merge.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h
index 21159d832..939f20214 100644
--- a/include/git2/merge.h
+++ b/include/git2/merge.h
@@ -376,6 +376,15 @@ GIT_EXTERN(int) git_merge_head_from_id(
const git_oid *id);
/**
+ * Gets the commit ID that the given `git_merge_head` refers to.
+ *
+ * @param id pointer to commit id to be filled in
+ * @param head the given merge head
+ */
+GIT_EXTERN(const git_oid *) git_merge_head_id(
+ const git_merge_head *head);
+
+/**
* Frees a `git_merge_head`.
*
* @param head merge head to free