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.
2329 Commits
49 Branches
Branch: stable-2.2
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'stable-2.2'
${ noResults }
jgit/org.eclipse.jgit/src/org/eclipse/jgit/merge
Robin Stocker b7f5ed5612 Add Javadoc description for packages 11 years ago
..
MergeAlgorithm.java Optimize MergeAlgorithm if ours or theirs is empty 13 years ago
MergeChunk.java Fix Javadoc warnings 13 years ago
MergeFormatter.java Refactor diff sequence API 13 years ago
MergeMessageFormatter.java Add "--squash" option to MergeCommand 12 years ago
MergeResult.java Refactor diff sequence API 13 years ago
MergeStrategy.java Move JGitText to an internal package 12 years ago
Merger.java Allow applications to pass ObjectInserter to Merger 12 years ago
ResolveMerger.java Fix ResolveMerger issue with submodule conflict 11 years ago
SquashMessageFormatter.java Add "--squash" option to MergeCommand 12 years ago
StrategyOneSided.java Extend merge support for bare repositories 13 years ago
StrategyResolve.java Extend merge support for bare repositories 13 years ago
StrategySimpleTwoWayInCore.java Simplify logic in StrategySimpleTwoWayInCore 13 years ago
ThreeWayMergeStrategy.java Extend merge support for bare repositories 13 years ago
ThreeWayMerger.java Fix ClassCastException in MergeCommand 12 years ago
package-info.java Add Javadoc description for packages 11 years ago