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.
3870 Commits
49 Branches
Tree: 6e4e34bb9e
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '6e4e34bb9e'
${ noResults }
jgit/org.eclipse.jgit/src/org/eclipse/jgit/merge
Shawn Pearce fb21fb10fc Revert "Fix unchecked conversion warning in MergeFormatter" 9 years ago
..
EolAwareOutputStream.java Optimize EolAwareOutputStream for bulk output 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 Revert "Fix unchecked conversion warning in MergeFormatter" 9 years ago
MergeFormatterPass.java Do not add a newline at the end if neither merged side had one 9 years ago
MergeMessageFormatter.java Silence non-externalized string warnings in org.eclipse.jgit 9 years ago
MergeResult.java Fix API errors raised on ResolveMerger affecting API providers only 9 years ago
MergeStrategy.java Add missing @since tags 11 years ago
Merger.java Delete deprecated Merger.getBaseCommit() 9 years ago
RecursiveMerger.java Use AutoClosable to close resources in bundle org.eclipse.jgit 9 years ago
ResolveMerger.java Use ANY_DIFF filter in ResolveMerger only for bare repositories 9 years ago
SquashMessageFormatter.java Silence non-externalized string warnings in org.eclipse.jgit 9 years ago
StrategyOneSided.java Fix exception on conflicts with recursive merge 10 years ago
StrategyRecursive.java Silence non-externalized string warnings in org.eclipse.jgit 9 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