Commit bf787bd8 by Carlos Martín Nieto

Move git_merge_base() to is own header and document it

parent f9e4bfa3
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "git2/repository.h" #include "git2/repository.h"
#include "git2/revwalk.h" #include "git2/revwalk.h"
#include "git2/merge.h"
#include "git2/refs.h" #include "git2/refs.h"
#include "git2/reflog.h" #include "git2/reflog.h"
......
/*
* Copyright (C) 2009-2012 the libgit2 contributors
*
* This file is part of libgit2, distributed under the GNU GPL v2 with
* a Linking Exception. For full terms see the included COPYING file.
*/
#ifndef INCLUDE_git_merge_h__
#define INCLUDE_git_merge_h__
#include "common.h"
#include "types.h"
#include "oid.h"
/**
* @file git2/merge.h
* @brief Git merge-base routines
* @defgroup git_revwalk Git merge-base routines
* @ingroup Git
* @{
*/
GIT_BEGIN_DECL
/**
* Find a merge base between two commits
*
* @param out the OID of a merge base between 'one' and 'two'
* @param repo the repository where the commits exist
* @param one one of the commits
* @param two the other commit
*/
GIT_EXTERN(int) git_merge_base(git_oid *out, git_repository *repo, git_oid *one, git_oid *two);
/** @} */
GIT_END_DECL
#endif
...@@ -232,9 +232,6 @@ GIT_EXTERN(void) git_revwalk_free(git_revwalk *walk); ...@@ -232,9 +232,6 @@ GIT_EXTERN(void) git_revwalk_free(git_revwalk *walk);
*/ */
GIT_EXTERN(git_repository *) git_revwalk_repository(git_revwalk *walk); GIT_EXTERN(git_repository *) git_revwalk_repository(git_revwalk *walk);
GIT_EXTERN(int) git_merge_base(git_oid *out, git_repository *repo, git_oid *one, git_oid *two);
/** @} */ /** @} */
GIT_END_DECL GIT_END_DECL
#endif #endif
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "pqueue.h" #include "pqueue.h"
#include "git2/revwalk.h" #include "git2/revwalk.h"
#include "git2/merge.h"
#include <regex.h> #include <regex.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment