.. |
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
|
Cleanup javadocs so they pass the java8 doclint checks
|
10 years ago |
MergeMessageFormatter.java
|
Add conflicts message before footer
|
11 years ago |
MergeResult.java
|
Refactor diff sequence API
|
13 years ago |
MergeStrategy.java
|
Add missing @since tags
|
11 years ago |
Merger.java
|
Fix exception on conflicts with recursive merge
|
10 years ago |
RecursiveMerger.java
|
Remove unused logger from RecursiveMerger
|
11 years ago |
ResolveMerger.java
|
Fix merge/cherry-picking in CRLF mode
|
10 years ago |
SquashMessageFormatter.java
|
Mark non-externalizable strings as such
|
11 years ago |
StrategyOneSided.java
|
Fix exception on conflicts with recursive merge
|
10 years ago |
StrategyRecursive.java
|
Fix @since tags in JGit, version 2.4 never existed
|
11 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 |