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).
|
org.eclipse.jgit.pgm |
Modifier and Type | Field and Description |
---|---|
private MergeStrategy |
MergeResult.mergeStrategy |
private MergeStrategy |
MergeCommand.mergeStrategy |
private MergeStrategy |
CherryPickCommand.strategy |
private MergeStrategy |
StashApplyCommand.strategy |
private MergeStrategy |
RebaseCommand.strategy |
private MergeStrategy |
SubmoduleUpdateCommand.strategy |
private MergeStrategy |
RevertCommand.strategy |
private MergeStrategy |
PullCommand.strategy |
Modifier and Type | Method and Description |
---|---|
CherryPickCommand |
CherryPickCommand.setStrategy(MergeStrategy strategy)
Set the
MergeStrategy |
StashApplyCommand |
StashApplyCommand.setStrategy(MergeStrategy strategy)
Set the
MergeStrategy to use. |
RebaseCommand |
RebaseCommand.setStrategy(MergeStrategy strategy)
Set the
MergeStrategy . |
SubmoduleUpdateCommand |
SubmoduleUpdateCommand.setStrategy(MergeStrategy strategy)
Setter for the field
strategy . |
RevertCommand |
RevertCommand.setStrategy(MergeStrategy strategy)
Set the merge strategy to use for this revert command
|
MergeCommand |
MergeCommand.setStrategy(MergeStrategy mergeStrategy)
Set merge strategy
|
PullCommand |
PullCommand.setStrategy(MergeStrategy strategy)
Set the @{code MergeStrategy}
|
Constructor and Description |
---|
MergeResult(ObjectId newHead,
ObjectId base,
ObjectId[] mergedCommits,
MergeResult.MergeStatus mergeStatus,
MergeStrategy mergeStrategy,
java.util.Map<java.lang.String,MergeResult<?>> lowLevelResults)
Constructor for MergeResult.
|
MergeResult(ObjectId newHead,
ObjectId base,
ObjectId[] mergedCommits,
MergeResult.MergeStatus mergeStatus,
MergeStrategy mergeStrategy,
java.util.Map<java.lang.String,MergeResult<?>> lowLevelResults,
java.util.Map<java.lang.String,ResolveMerger.MergeFailureReason> failingPaths,
java.lang.String description)
Constructor for MergeResult.
|
MergeResult(ObjectId newHead,
ObjectId base,
ObjectId[] mergedCommits,
MergeResult.MergeStatus mergeStatus,
MergeStrategy mergeStrategy,
java.util.Map<java.lang.String,MergeResult<?>> lowLevelResults,
java.lang.String description)
Constructor for MergeResult.
|
Modifier and Type | Class and 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 and 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 | Field and Description |
---|---|
private static java.util.HashMap<java.lang.String,MergeStrategy> |
MergeStrategy.STRATEGIES |
Modifier and Type | Method and Description |
---|---|
static MergeStrategy[] |
MergeStrategy.get()
Get all registered strategies.
|
static MergeStrategy |
MergeStrategy.get(java.lang.String name)
Locate a strategy by name.
|
Modifier and Type | Method and Description |
---|---|
static void |
MergeStrategy.register(MergeStrategy imp)
Register a merge strategy so it can later be obtained by name.
|
static void |
MergeStrategy.register(java.lang.String name,
MergeStrategy imp)
Register a merge strategy so it can later be obtained by name.
|
Modifier and Type | Field and Description |
---|---|
private MergeStrategy |
NoteMapMerger.nonNotesMergeStrategy |
Constructor and Description |
---|
NoteMapMerger(Repository db,
NoteMerger noteMerger,
MergeStrategy nonNotesMergeStrategy)
Constructs a NoteMapMerger with custom
NoteMerger and custom
MergeStrategy . |
Modifier and Type | Field and Description |
---|---|
private MergeStrategy |
Merge.mergeStrategy |