Package | Description |
---|---|
org.eclipse.jgit.dircache |
Reading and editing the directory cache (index).
|
org.eclipse.jgit.merge |
Content and commit history merge algorithms.
|
Modifier and Type | Method and Description |
---|---|
(package private) void |
DirCacheCheckout.processEntry(CanonicalTreeParser h,
CanonicalTreeParser m,
DirCacheBuildIterator i,
WorkingTreeIterator f)
Here the main work is done.
|
(package private) void |
DirCacheCheckout.processEntry(CanonicalTreeParser m,
DirCacheBuildIterator i,
WorkingTreeIterator f)
Processing an entry in the context of
DirCacheCheckout.prescanOneTree() when only
one tree is given |
Constructor and Description |
---|
DirCacheBuildIterator(DirCacheBuildIterator p,
DirCacheTree dct) |
Modifier and Type | Method and Description |
---|---|
protected boolean |
ResolveMerger.processEntry(CanonicalTreeParser base,
CanonicalTreeParser ours,
CanonicalTreeParser theirs,
DirCacheBuildIterator index,
WorkingTreeIterator work,
boolean ignoreConflicts,
Attributes attributes)
Processes one path and tries to merge taking git attributes in account.
|