Merger: clarify getBaseCommit javadoc
Change-Id: Ic52475248a545d51d3d8ac31a24f0344a1241e45
This commit is contained in:
parent
e06082c171
commit
fa5582f3fe
|
@ -193,11 +193,15 @@ public boolean merge(final AnyObjectId... tips) throws IOException {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the merge base of two commits.
|
* Return the merge base of two commits.
|
||||||
|
* <p>
|
||||||
|
* May only be called after {@link #merge(RevCommit...)}.
|
||||||
*
|
*
|
||||||
* @param aIdx
|
* @param aIdx
|
||||||
* index of the first commit in {@link #sourceObjects}.
|
* index of the first commit in tips passed to
|
||||||
|
* {@link #merge(RevCommit...)}.
|
||||||
* @param bIdx
|
* @param bIdx
|
||||||
* index of the second commit in {@link #sourceObjects}.
|
* index of the second commit in tips passed to
|
||||||
|
* {@link #merge(RevCommit...)}.
|
||||||
* @return the merge base of two commits
|
* @return the merge base of two commits
|
||||||
* @throws IncorrectObjectTypeException
|
* @throws IncorrectObjectTypeException
|
||||||
* one of the input objects is not a commit.
|
* one of the input objects is not a commit.
|
||||||
|
|
Loading…
Reference in New Issue