]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c869f18) | patch
Add getBaseCommit() to Merger 56/1356/3
authorChristian Halstrick <christian.halstrick@sap.com>
Fri, 20 Aug 2010 15:17:01 +0000 (17:17 +0200)
committerShawn O. Pearce <spearce@spearce.org>
Fri, 27 Aug 2010 01:52:26 +0000 (18:52 -0700)
commit0e7a38b60fbb88db4c61fd185ec17416540463d2
tree6e6897aae5482aa5ebfd708607e57e71d971ea76tree | snapshot
parentc869f187b754c6364a0ecf1f02e30e52b08ddeb1commit | diff
Add getBaseCommit() to Merger

The Merger was was only exposing the merge base as an
AbstractTreeIterator. Since we need the merge base as
RevCommit to generate the merge result I expose it here.

Change-Id: Ibe846370a35ac9bdb0c97ce2e36b2287577fbcad
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit