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

Modifier and Type	Method and Description
static MergeConfig	getConfigForCurrentBranch(Repository repo) Get merge configuration for the current branch of the repository
MergeCommand.FastForwardMode	getFastForwardMode() Get the fast forward mode configured for this branch
static Config.SectionParser<MergeConfig>	getParser(String branch) Get a parser for use with Config.get(SectionParser)
boolean	isCommit() Whether --no-commit option is not set.
boolean	isSquash() Whether merges into this branch are configured to be squash merges, false otherwise

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Method Detail

getConfigForCurrentBranch

public static MergeConfig getConfigForCurrentBranch(Repository repo)

Get merge configuration for the current branch of the repository

Parameters:

repo - a Repository object.

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 with Config.get(SectionParser)

Parameters:

branch - short branch name to get the configuration for, as returned e.g. by Repository.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-commit option is not set.

Returns:

false if --no-commit is configured for this branch, true otherwise (even if --squash is configured)