mirrors
/
jgit
mirror of https://github.com/eclipse/jgit.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 204 Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
3393 Commits
49 Branches
Tree: 75b4a23748
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '75b4a23748'
${ noResults }
jgit/org.eclipse.jgit/src/org/eclipse/jgit/merge
Shawn Pearce 75b4a23748 Deprecate checkoutEntry variant that accepts File 9 years ago
..
MergeAlgorithm.java Optimize MergeAlgorithm if ours or theirs is empty 13 years ago
MergeChunk.java Fix Javadoc warnings 14 years ago
MergeConfig.java Use branch.<x>.mergeoptions and merge.ff as defaults for merging 10 years ago
MergeFormatter.java Cleanup javadocs so they pass the java8 doclint checks 10 years ago
MergeMessageFormatter.java Add conflicts message before footer 11 years ago
MergeResult.java Fix API errors raised on ResolveMerger affecting API providers only 10 years ago
MergeStrategy.java Add missing @since tags 11 years ago
Merger.java Add a Merger.merge method that makes flushing optional 10 years ago
RecursiveMerger.java Rename local variables/parameters to remove warnings about hiding 9 years ago
ResolveMerger.java Deprecate checkoutEntry variant that accepts File 9 years ago
SquashMessageFormatter.java Mark non-externalizable strings as such 11 years ago
StrategyOneSided.java Fix exception on conflicts with recursive merge 10 years ago
StrategyRecursive.java Fix @since tags in JGit, version 2.4 never existed 11 years ago
StrategyResolve.java Mark non-externalizable strings as such 11 years ago
StrategySimpleTwoWayInCore.java Mark non-externalizable strings as such 11 years ago
ThreeWayMergeStrategy.java Extend merge support for bare repositories 13 years ago
ThreeWayMerger.java Fix exception on conflicts with recursive merge 10 years ago
package-info.java Add Javadoc description for packages 11 years ago