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.
4627 Commits
49 Branches
Tree: 6b4de1a460
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '6b4de1a460'
${ noResults }
jgit/org.eclipse.jgit/src/org/eclipse/jgit/merge
David Pursehouse c15903ea3e MergeFormatter: Suppress warning about unchecked conversion 7 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 MergeFormatter: Suppress warning about unchecked conversion 7 years ago
MergeFormatterPass.java Do not add a newline at the end if neither merged side had one 9 years ago
MergeMessageFormatter.java Null-annotated Ref class and fixed related compiler errors 8 years ago
MergeResult.java [performance] Remove synthetic access$ methods in dfs, diff and merge 8 years ago
MergeStrategy.java Add missing @since tags 11 years ago
Merger.java Add progress monitor to Merger 8 years ago
RecursiveMerger.java DirCache: Add helper to read from a tree 8 years ago
ResolveMerger.java Fix calling of clean/smudge filters from Checkout,MergeCommands 8 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 Fix calling of clean/smudge filters from Checkout,MergeCommands 8 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