mirrors/jgit - jgit - source @ dussan.org

Historique

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