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 年之前