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 роки тому