Package | Description |
---|---|
org.eclipse.jgit.merge |
Content and commit history merge algorithms.
|
org.eclipse.jgit.treewalk |
Walking and comparing directory/file trees (of commits, file system).
|
Modifier and Type | Method | Description |
---|---|---|
protected boolean |
ResolveMerger.processEntry(CanonicalTreeParser base,
CanonicalTreeParser ours,
CanonicalTreeParser theirs,
DirCacheBuildIterator index,
WorkingTreeIterator work,
boolean ignoreConflicts) |
Processes one path and tries to merge.
|
Modifier and Type | Method | Description |
---|---|---|
CanonicalTreeParser |
CanonicalTreeParser.createSubtreeIterator(ObjectReader reader) |
|
CanonicalTreeParser |
CanonicalTreeParser.createSubtreeIterator(ObjectReader reader,
MutableObjectId idBuffer) |
|
CanonicalTreeParser |
CanonicalTreeParser.createSubtreeIterator0(ObjectReader reader,
AnyObjectId id) |
Back door to quickly create a subtree iterator for any subtree.
|
CanonicalTreeParser |
CanonicalTreeParser.getParent() |
Deprecated.
internal use only
|
CanonicalTreeParser |
CanonicalTreeParser.next() |
|
CanonicalTreeParser |
CanonicalTreeParser.resetRoot(ObjectReader reader,
AnyObjectId id) |
Reset this parser to walk through the given tree.
|
Copyright © 2018. All rights reserved.