motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merger: clarify getBaseCommit javadoc 

Change-Id: Ic52475248a545d51d3d8ac31a24f0344a1241e45
This commit is contained in:
Dave Borowitz 2013-05-03 10:21:50 -07:00 committed by Shawn Pearce
parent e06082c171
commit fa5582f3fe
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java
View File

@ -193,11 +193,15 @@ public boolean merge(final AnyObjectId... tips) throws IOException {
/**
* Return the merge base of two commits.
* <p>
* May only be called after {@link #merge(RevCommit...)}.
*
* @param aIdx
* index of the first commit in {@link #sourceObjects}.
* index of the first commit in tips passed to
* {@link #merge(RevCommit...)}.
* @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
* @throws IncorrectObjectTypeException
* one of the input objects is not a commit.