.. |
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
|
8 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
|
Use FS#lastModified instead of File#lastModified
|
7 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 |