diff options
| author | Vicent Marti <vicent@github.com> | 2014-03-31 19:17:01 +0200 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-03-31 19:17:01 +0200 |
| commit | 336e89572192b75b803970f316417d5f5309ee7b (patch) | |
| tree | 06eb89e9b77214308033cd40b6656f4c33ffadf7 /include/git2/merge.h | |
| parent | 088334278bf5ecb084f043f0ec526f85fc19554d (diff) | |
| parent | 976634c4672f3e1144b8f11c6c984157a28f5d98 (diff) | |
| download | libgit2-336e89572192b75b803970f316417d5f5309ee7b.tar.gz | |
Merge pull request #2222 from ethomson/merge_head_id
Introduce git_merge_head_id
Diffstat (limited to 'include/git2/merge.h')
| -rw-r--r-- | include/git2/merge.h | 9 |
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 |