mirrors/jgit - jgit - source @ dussan.org

История

Shawn Pearce 3886a4f68b ResolveMerger: Use checkoutEntry during abort The cleanUp path is trying to restore files that previously were clean, but were overwritten in the work tree by a partial merge attempt that has failed and needs to be aborted. Reuse the checkout logic to write the file content and refresh the stat data. Change-Id: I320d33b3744daf88d3155db99e957408937ddd00		преди 9 години
..
MergeAlgorithm.java	Optimize MergeAlgorithm if ours or theirs is empty	преди 13 години
MergeChunk.java	Fix Javadoc warnings	преди 14 години
MergeConfig.java	Use branch.<x>.mergeoptions and merge.ff as defaults for merging	преди 10 години
MergeFormatter.java	Cleanup javadocs so they pass the java8 doclint checks	преди 10 години
MergeMessageFormatter.java	Add conflicts message before footer	преди 11 години
MergeResult.java	Fix API errors raised on ResolveMerger affecting API providers only	преди 9 години
MergeStrategy.java	Add missing @since tags	преди 11 години
Merger.java	Add a Merger.merge method that makes flushing optional	преди 9 години
RecursiveMerger.java	Rename local variables/parameters to remove warnings about hiding	преди 9 години
ResolveMerger.java	ResolveMerger: Use checkoutEntry during abort	преди 9 години
SquashMessageFormatter.java	Mark non-externalizable strings as such	преди 11 години
StrategyOneSided.java	Fix exception on conflicts with recursive merge	преди 10 години
StrategyRecursive.java	Fix @since tags in JGit, version 2.4 never existed	преди 11 години
StrategyResolve.java	Mark non-externalizable strings as such	преди 11 години
StrategySimpleTwoWayInCore.java	Mark non-externalizable strings as such	преди 11 години
ThreeWayMergeStrategy.java	Extend merge support for bare repositories	преди 13 години
ThreeWayMerger.java	Fix exception on conflicts with recursive merge	преди 10 години
package-info.java	Add Javadoc description for packages	преди 11 години