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.
8163 Commits
49 Branches
Tree: 0f442d7083
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '0f442d7083'
${ noResults }
jgit/org.eclipse.jgit/src/org/eclipse/jgit/merge
Demetr Starshov 214c4afc2c ResolveMerger: do not content-merge gitlinks on del/mod conflicts 3 years ago
..
EolAwareOutputStream.java Fix javadoc in org.eclipse.jgit merge package 6 years ago
MergeAlgorithm.java Merge branch 'stable-5.6' 4 years ago
MergeChunk.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
MergeConfig.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
MergeFormatter.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
MergeFormatterPass.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
MergeMessageFormatter.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
MergeResult.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
MergeStrategy.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
Merger.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
RecursiveMerger.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
ResolveMerger.java ResolveMerger: do not content-merge gitlinks on del/mod conflicts 3 years ago
SquashMessageFormatter.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
StrategyOneSided.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
StrategyRecursive.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
StrategyResolve.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
StrategySimpleTwoWayInCore.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
ThreeWayMergeStrategy.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
ThreeWayMerger.java Update EDL 1.0 license headers to new short SPDX compliant format 4 years ago
package-info.java Add Javadoc description for packages 11 years ago