| Package | Description | 
|---|---|
| org.eclipse.jgit.notes | 
 Git notes processing (for commits, etc). 
 | 
| Modifier and Type | Method and Description | 
|---|---|
NoteMap | 
NoteMapMerger.merge(NoteMap base,
     NoteMap ours,
     NoteMap theirs)
Performs the merge. 
 | 
static NoteMap | 
NoteMap.newEmptyMap()
Construct a new empty note map. 
 | 
static NoteMap | 
NoteMap.read(ObjectReader reader,
    RevCommit commit)
Load a collection of notes from a branch. 
 | 
static NoteMap | 
NoteMap.read(ObjectReader reader,
    RevTree tree)
Load a collection of notes from a tree. 
 | 
static NoteMap | 
NoteMap.readTree(ObjectReader reader,
        ObjectId treeId)
Load a collection of notes from a tree. 
 | 
| Modifier and Type | Method and Description | 
|---|---|
NoteMap | 
NoteMapMerger.merge(NoteMap base,
     NoteMap ours,
     NoteMap theirs)
Performs the merge. 
 | 
Copyright © 2018 Eclipse JGit Project. All rights reserved.