906887a73586a7fa2ffdeaa8041e045cfbcfd7e2 - jgit

commit: 906887a73586a7fa2ffdeaa8041e045cfbcfd7e2
[log] [tgz]
author: Dmitry Fink <jgit@finik.net>
Tue Sep 21 09:37:01 2010 -0700
committer: Dmitry Fink <jgit@finik.net>
Fri Sep 24 11:01:20 2010 -0700
tree: d20a270719da9665b25d28fc4689007e2649d2fc
parent: a67afbfee10ca2963f5f0f52f701376e382572e2 [diff]

Extend merge support for bare repositories

Optional inCore parameter to Resolver/Strategy will
instruct it to perform all the operations in memory
and avoid modifying working folder even if there is one.

Change-Id: I5b873dead3682f79110f58d7806e43f50bcc5045

org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeStrategy.java[diff]
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java[diff]
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyOneSided.java[diff]
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyResolve.java[diff]
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java[diff]
org.eclipse.jgit/src/org/eclipse/jgit/merge/ThreeWayMergeStrategy.java[diff]
org.eclipse.jgit/src/org/eclipse/jgit/merge/ThreeWayMerger.java[diff]

7 files changed

tree: d20a270719da9665b25d28fc4689007e2649d2fc

org.eclipse.jgit/
org.eclipse.jgit.console/
org.eclipse.jgit.http.server/
org.eclipse.jgit.http.test/
org.eclipse.jgit.iplog/
org.eclipse.jgit.junit/
org.eclipse.jgit.packaging/
org.eclipse.jgit.pgm/
org.eclipse.jgit.test/
org.eclipse.jgit.ui/
tools/
.eclipse_iplog
.gitattributes
LICENSE
pom.xml
README
SUBMITTING_PATCHES