Package | Description |
---|---|
org.eclipse.jgit.api |
High-level API commands (the porcelain of JGit).
|
org.eclipse.jgit.merge |
Content and commit history merge algorithms.
|
org.eclipse.jgit.notes |
Git notes processing (for commits, etc).
|
Modifier and Type | Method | Description |
---|---|---|
CherryPickCommand |
CherryPickCommand.setStrategy(MergeStrategy strategy) |
|
MergeCommand |
MergeCommand.setStrategy(MergeStrategy mergeStrategy) |
|
PullCommand |
PullCommand.setStrategy(MergeStrategy strategy) |
|
RebaseCommand |
RebaseCommand.setStrategy(MergeStrategy strategy) |
|
RevertCommand |
RevertCommand.setStrategy(MergeStrategy strategy) |
|
StashApplyCommand |
StashApplyCommand.setStrategy(MergeStrategy strategy) |
|
SubmoduleUpdateCommand |
SubmoduleUpdateCommand.setStrategy(MergeStrategy strategy) |
Constructor | Description |
---|---|
MergeResult(ObjectId newHead,
ObjectId base,
ObjectId[] mergedCommits,
MergeResult.MergeStatus mergeStatus,
MergeStrategy mergeStrategy,
Map<String,MergeResult<?>> lowLevelResults) |
|
MergeResult(ObjectId newHead,
ObjectId base,
ObjectId[] mergedCommits,
MergeResult.MergeStatus mergeStatus,
MergeStrategy mergeStrategy,
Map<String,MergeResult<?>> lowLevelResults,
String description) |
|
MergeResult(ObjectId newHead,
ObjectId base,
ObjectId[] mergedCommits,
MergeResult.MergeStatus mergeStatus,
MergeStrategy mergeStrategy,
Map<String,MergeResult<?>> lowLevelResults,
Map<String,ResolveMerger.MergeFailureReason> failingPaths,
String description) |
Modifier and Type | Class | Description |
---|---|---|
class |
StrategyOneSided |
Trivial merge strategy to make the resulting tree exactly match an input.
|
class |
StrategyRecursive |
A three-way merge strategy performing a content-merge if necessary
|
class |
StrategyResolve |
A three-way merge strategy performing a content-merge if necessary
|
class |
StrategySimpleTwoWayInCore |
Merges two commits together in-memory, ignoring any working directory.
|
class |
ThreeWayMergeStrategy |
A merge strategy to merge 2 trees, using a common base ancestor tree.
|
Modifier and Type | Field | Description |
---|---|---|
static MergeStrategy |
MergeStrategy.OURS |
Simple strategy that sets the output tree to the first input tree.
|
static MergeStrategy |
MergeStrategy.THEIRS |
Simple strategy that sets the output tree to the second input tree.
|
Modifier and Type | Method | Description |
---|---|---|
static MergeStrategy[] |
MergeStrategy.get() |
Get all registered strategies.
|
static MergeStrategy |
MergeStrategy.get(String name) |
Locate a strategy by name.
|
Modifier and Type | Method | Description |
---|---|---|
static void |
MergeStrategy.register(String name,
MergeStrategy imp) |
Register a merge strategy so it can later be obtained by name.
|
static void |
MergeStrategy.register(MergeStrategy imp) |
Register a merge strategy so it can later be obtained by name.
|
Constructor | Description |
---|---|
NoteMapMerger(Repository db,
NoteMerger noteMerger,
MergeStrategy nonNotesMergeStrategy) |
Constructs a NoteMapMerger with custom
NoteMerger and custom
MergeStrategy . |
Copyright © 2018. All rights reserved.