summaryrefslogtreecommitdiff
path: root/src/annotated_commit.h
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2015-11-09 13:01:48 -0500
committerEdward Thomson <ethomson@microsoft.com>2015-11-25 15:38:03 -0500
commit7730fe8e9cda1e160bff1e78dfa2a898799d4365 (patch)
tree967366997111bf96fef7ee1fd333f6132176d370 /src/annotated_commit.h
parent3f2bb387a43185991d7e077fa5e6c0bb467f2abc (diff)
downloadlibgit2-7730fe8e9cda1e160bff1e78dfa2a898799d4365.tar.gz
merge: merge annotated commits instead of regular commits
Diffstat (limited to 'src/annotated_commit.h')
-rw-r--r--src/annotated_commit.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/annotated_commit.h b/src/annotated_commit.h
index 37e3d9951..9a041176e 100644
--- a/src/annotated_commit.h
+++ b/src/annotated_commit.h
@@ -21,5 +21,7 @@ struct git_annotated_commit {
extern int git_annotated_commit_from_head(git_annotated_commit **out,
git_repository *repo);
+extern int git_annotated_commit_from_commit(git_annotated_commit **out,
+ git_commit *commit);
#endif