Package | Description |
---|---|
org.eclipse.jgit.api |
High-level API commands (the porcelain of JGit).
|
org.eclipse.jgit.merge |
Content and commit history merge algorithms.
|
Modifier and Type | Method and Description |
---|---|
StashApplyCommand |
StashApplyCommand.setContentMergeStrategy(ContentMergeStrategy strategy)
Sets the content merge strategy to use if the
merge strategy is "resolve" or
"recursive". |
CherryPickCommand |
CherryPickCommand.setContentMergeStrategy(ContentMergeStrategy strategy)
Sets the content merge strategy to use if the
merge strategy is "resolve" or
"recursive". |
PullCommand |
PullCommand.setContentMergeStrategy(ContentMergeStrategy strategy)
Sets the content merge strategy to use if the
merge strategy is "resolve" or
"recursive". |
RebaseCommand |
RebaseCommand.setContentMergeStrategy(ContentMergeStrategy strategy)
Sets the content merge strategy to use if the
merge strategy is "resolve" or
"recursive". |
MergeCommand |
MergeCommand.setContentMergeStrategy(ContentMergeStrategy strategy)
Sets the content merge strategy to use if the
merge strategy is "resolve" or
"recursive". |
Modifier and Type | Method and Description |
---|---|
ContentMergeStrategy |
MergeAlgorithm.getContentMergeStrategy()
Retrieves the
ContentMergeStrategy . |
ContentMergeStrategy |
ResolveMerger.getContentMergeStrategy()
Retrieves the content merge strategy for content conflicts.
|
static ContentMergeStrategy |
ContentMergeStrategy.valueOf(String name)
Returns the enum constant of this type with the specified name.
|
static ContentMergeStrategy[] |
ContentMergeStrategy.values()
Returns an array containing the constants of this enum type, in
the order they are declared.
|
Modifier and Type | Method and Description |
---|---|
void |
MergeAlgorithm.setContentMergeStrategy(ContentMergeStrategy strategy)
Sets the
ContentMergeStrategy . |
void |
ResolveMerger.setContentMergeStrategy(ContentMergeStrategy strategy)
Sets the content merge strategy for content conflicts.
|
Copyright © 2021 Eclipse JGit Project. All rights reserved.