]> source.dussan.org Git - jgit.git/commitdiff
Merger: clarify getBaseCommit javadoc 02/12502/3
authorDave Borowitz <dborowitz@google.com>
Fri, 3 May 2013 17:21:50 +0000 (10:21 -0700)
committerShawn Pearce <spearce@spearce.org>
Mon, 11 Aug 2014 21:46:45 +0000 (14:46 -0700)
Change-Id: Ic52475248a545d51d3d8ac31a24f0344a1241e45

org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java

index 6dba41298729a3e9868d1ead153d8354ec41a492..ffe80aacd4146c78d5a52d29a79a791a1b9e51f2 100644 (file)
@@ -193,11 +193,15 @@ public abstract class Merger {
 
        /**
         * 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.