]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a67afbf) | patch
Extend merge support for bare repositories 29/1629/5
authorDmitry Fink <jgit@finik.net>
Tue, 21 Sep 2010 16:37:01 +0000 (09:37 -0700)
committerDmitry Fink <jgit@finik.net>
Fri, 24 Sep 2010 18:01:20 +0000 (11:01 -0700)
commit906887a73586a7fa2ffdeaa8041e045cfbcfd7e2
treed20a270719da9665b25d28fc4689007e2649d2fctree | snapshot
parenta67afbfee10ca2963f5f0f52f701376e382572e2commit | 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 | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyOneSided.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyResolve.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/ThreeWayMergeStrategy.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/ThreeWayMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit