mirrors/jgit - jgit - source @ dussan.org

Geschiedenis

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 jaren geleden
..
MergeAlgorithm.java	Optimize MergeAlgorithm if ours or theirs is empty	13 jaren geleden
MergeChunk.java	Fix Javadoc warnings	14 jaren geleden
MergeConfig.java	Use branch.<x>.mergeoptions and merge.ff as defaults for merging	10 jaren geleden
MergeFormatter.java	Cleanup javadocs so they pass the java8 doclint checks	10 jaren geleden
MergeMessageFormatter.java	Add conflicts message before footer	11 jaren geleden
MergeResult.java	Fix API errors raised on ResolveMerger affecting API providers only	9 jaren geleden
MergeStrategy.java	Add missing @since tags	11 jaren geleden
Merger.java	Add a Merger.merge method that makes flushing optional	9 jaren geleden
RecursiveMerger.java	Rename local variables/parameters to remove warnings about hiding	9 jaren geleden
ResolveMerger.java	ResolveMerger: Use checkoutEntry during abort	9 jaren geleden
SquashMessageFormatter.java	Mark non-externalizable strings as such	11 jaren geleden
StrategyOneSided.java	Fix exception on conflicts with recursive merge	10 jaren geleden
StrategyRecursive.java	Fix @since tags in JGit, version 2.4 never existed	11 jaren geleden
StrategyResolve.java	Mark non-externalizable strings as such	11 jaren geleden
StrategySimpleTwoWayInCore.java	Mark non-externalizable strings as such	11 jaren geleden
ThreeWayMergeStrategy.java	Extend merge support for bare repositories	13 jaren geleden
ThreeWayMerger.java	Fix exception on conflicts with recursive merge	10 jaren geleden
package-info.java	Add Javadoc description for packages	11 jaren geleden