Package org.eclipse.jgit.merge
Class MergeConfig
- java.lang.Object
-
- org.eclipse.jgit.merge.MergeConfig
-
public class MergeConfig extends Object
Holds configuration for merging into a given branch- Since:
- 3.3
-
-
Method Summary
All Methods Static Methods Instance Methods Concrete Methods Modifier and Type Method Description static MergeConfiggetConfigForCurrentBranch(Repository repo)Get merge configuration for the current branch of the repositoryMergeCommand.FastForwardModegetFastForwardMode()Get the fast forward mode configured for this branchstatic Config.SectionParser<MergeConfig>getParser(String branch)Get a parser for use withConfig.get(SectionParser)booleanisCommit()Whether--no-commitoption is not set.booleanisSquash()Whether merges into this branch are configured to be squash merges, false otherwise
-
-
-
Method Detail
-
getConfigForCurrentBranch
public static MergeConfig getConfigForCurrentBranch(Repository repo)
Get merge configuration for the current branch of the repository- Parameters:
repo- aRepositoryobject.- Returns:
- merge configuration for the current branch of the repository
-
getParser
public static final Config.SectionParser<MergeConfig> getParser(String branch)
Get a parser for use withConfig.get(SectionParser)- Parameters:
branch- short branch name to get the configuration for, as returned e.g. byRepository.getBranch()- Returns:
- a parser for use with
Config.get(SectionParser)
-
getFastForwardMode
public MergeCommand.FastForwardMode getFastForwardMode()
Get the fast forward mode configured for this branch- Returns:
- the fast forward mode configured for this branch
-
isSquash
public boolean isSquash()
Whether merges into this branch are configured to be squash merges, false otherwise- Returns:
- true if merges into this branch are configured to be squash merges, false otherwise
-
isCommit
public boolean isCommit()
Whether--no-commitoption is not set.- Returns:
falseif --no-commit is configured for this branch,trueotherwise (even if --squash is configured)
-
-