org.netbeans.libs.git

Enum GitRepository.FastForwardOption

java.lang.Object

java.lang.Enum<GitRepository.FastForwardOption>

org.netbeans.libs.git.GitRepository.FastForwardOption

All Implemented Interfaces:

Serializable, Comparable<GitRepository.FastForwardOption>

Enclosing class:

GitRepository

public static enum GitRepository.FastForwardOption
extends Enum<GitRepository.FastForwardOption>

Option specifying how to deal with merges and merge commits. Required by GitClient.merge(java.lang.String, org.netbeans.libs.git.GitRepository.FastForwardOption, org.netbeans.libs.git.progress.ProgressMonitor). To get the repository's default value, get it with GitRepository.getDefaultFastForwardOption().

Since:

1.26

Enum Constant Summary

Enum Constants

Enum Constant and Description
FAST_FORWARD Merge will not create a new commit if possible and only update the branch reference to the merged commit.
FAST_FORWARD_ONLY Merge will fail if fast forward is impossible, no merge commit will be created under any circumstances.
NO_FAST_FORWARD Will always create a merge commit even if fast forward were possible.

Method Summary

Modifier and Type	Method and Description
static GitRepository.FastForwardOption	valueOf(String name) Returns the enum constant of this type with the specified name.
static GitRepository.FastForwardOption[]	values() Returns an array containing the constants of this enum type, in the order they are declared.

Methods inherited from class java.lang.Enum

clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf

Methods inherited from class java.lang.Object

getClass, notify, notifyAll, wait, wait, wait

Enum Constant Detail

FAST_FORWARD

public static final GitRepository.FastForwardOption FAST_FORWARD

Merge will not create a new commit if possible and only update the branch reference to the merged commit. This will usually happen if the merged commit is a descendant of the branch's head commit.

FAST_FORWARD_ONLY

public static final GitRepository.FastForwardOption FAST_FORWARD_ONLY

Merge will fail if fast forward is impossible, no merge commit will be created under any circumstances.

NO_FAST_FORWARD

public static final GitRepository.FastForwardOption NO_FAST_FORWARD

Will always create a merge commit even if fast forward were possible.

Method Detail

values

public static GitRepository.FastForwardOption[] values()

Returns:

an array containing the constants of this enum type, in the order they are declared

valueOf

public static GitRepository.FastForwardOption valueOf(String name)

Parameters:

name - the name of the enum constant to be returned.

Returns:

the enum constant with the specified name

Throws:

IllegalArgumentException - if this enum type has no constant with the specified name

NullPointerException - if the argument is null