com.atlassian.bitbucket.scm.git.command

Class GitMergeCommandParameters

java.lang.Object

com.atlassian.bitbucket.util.BuilderSupport

com.atlassian.bitbucket.scm.AbstractCommandParameters

com.atlassian.bitbucket.scm.AbstractMergeCommandParameters

com.atlassian.bitbucket.scm.MergeCommandParameters

com.atlassian.bitbucket.scm.git.command.GitMergeCommandParameters

public class GitMergeCommandParameters
extends com.atlassian.bitbucket.scm.MergeCommandParameters

Since:

5.0

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
static class	GitMergeCommandParameters.Builder

Nested classes/interfaces inherited from class com.atlassian.bitbucket.scm.MergeCommandParameters

com.atlassian.bitbucket.scm.MergeCommandParameters.AbstractMergeBuilder<B extends com.atlassian.bitbucket.scm.MergeCommandParameters.AbstractMergeBuilder<B>>

Nested classes/interfaces inherited from class com.atlassian.bitbucket.scm.AbstractMergeCommandParameters

com.atlassian.bitbucket.scm.AbstractMergeCommandParameters.AbstractBuilder<B extends com.atlassian.bitbucket.scm.AbstractMergeCommandParameters.AbstractBuilder<B>>

Field Summary

Fields inherited from class com.atlassian.bitbucket.util.BuilderSupport

NOT_BLANK

Method Summary

Modifier and Type	Method and Description
OptionalInt	getLog() Deprecated. in 6.7 for removal in 7.0. Use AbstractMergeCommandParameters.getCommitSummaries() instead.

Methods inherited from class com.atlassian.bitbucket.scm.MergeCommandParameters

getFromBranch, getFromCommitId, getFromRepository, getToBranch, hasFromRepository

Methods inherited from class com.atlassian.bitbucket.scm.AbstractMergeCommandParameters

getAuthor, getCommitSummaries, getCommitter, getMessage, getStrategyId, isDryRun

Methods inherited from class com.atlassian.bitbucket.util.BuilderSupport

addIf, addIf, addIf, addIf, addIf, addIf, checkNotBlank, requireNonBlank

Methods inherited from class java.lang.Object

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

Method Detail

getLog

@Deprecated
 @Nonnull
public OptionalInt getLog()

Deprecated. in 6.7 for removal in 7.0. Use AbstractMergeCommandParameters.getCommitSummaries() instead.

Returns:

whether or not to use --log=N in the merge command, where N is the number of lines of commit messages to summarise (default is 20).