Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
eac76956
Commit
eac76956
authored
Nov 26, 2012
by
Ben Straub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Format/documentation tweaks for merge.h
parent
4ff192d3
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
2 deletions
+12
-2
include/git2/merge.h
+12
-2
No files found.
include/git2/merge.h
View file @
eac76956
...
@@ -27,8 +27,13 @@ GIT_BEGIN_DECL
...
@@ -27,8 +27,13 @@ GIT_BEGIN_DECL
* @param repo the repository where the commits exist
* @param repo the repository where the commits exist
* @param one one of the commits
* @param one one of the commits
* @param two the other commit
* @param two the other commit
* @return Zero on success; GIT_ENOTFOUND or -1 on failure.
*/
*/
GIT_EXTERN
(
int
)
git_merge_base
(
git_oid
*
out
,
git_repository
*
repo
,
const
git_oid
*
one
,
const
git_oid
*
two
);
GIT_EXTERN
(
int
)
git_merge_base
(
git_oid
*
out
,
git_repository
*
repo
,
const
git_oid
*
one
,
const
git_oid
*
two
);
/**
/**
* Find a merge base given a list of commits
* Find a merge base given a list of commits
...
@@ -37,8 +42,13 @@ GIT_EXTERN(int) git_merge_base(git_oid *out, git_repository *repo, const git_oid
...
@@ -37,8 +42,13 @@ GIT_EXTERN(int) git_merge_base(git_oid *out, git_repository *repo, const git_oid
* @param repo the repository where the commits exist
* @param repo the repository where the commits exist
* @param input_array oids of the commits
* @param input_array oids of the commits
* @param length The number of commits in the provided `input_array`
* @param length The number of commits in the provided `input_array`
* @return Zero on success; GIT_ENOTFOUND or -1 on failure.
*/
*/
GIT_EXTERN
(
int
)
git_merge_base_many
(
git_oid
*
out
,
git_repository
*
repo
,
const
git_oid
input_array
[],
size_t
length
);
GIT_EXTERN
(
int
)
git_merge_base_many
(
git_oid
*
out
,
git_repository
*
repo
,
const
git_oid
input_array
[],
size_t
length
);
/** @} */
/** @} */
GIT_END_DECL
GIT_END_DECL
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment