| Enum constant | Description |
|---|---|
CREATE_COMMIT |
Always creates a merge commit (even if a fast-forward is possible). |
DEFAULT |
Fast-forwards if possible, creates a merge commit otherwise. |
NO_COMMIT |
Merges changes, but does not commit them. |
ONLY_FF |
Only merges if a fast-forward is possible. |
SQUASH |
Squashes the merged changes into one set and leaves them uncommitted. |
| Methods inherited from class | Name |
|---|---|
class java.lang.Object |
java.lang.Object#wait(long, int), java.lang.Object#wait(long), java.lang.Object#wait(), java.lang.Object#equals(java.lang.Object), java.lang.Object#toString(), java.lang.Object#hashCode(), java.lang.Object#getClass(), java.lang.Object#notify(), java.lang.Object#notifyAll() |
Always creates a merge commit (even if a fast-forward is possible). Behaves like --no-ff.
Fast-forwards if possible, creates a merge commit otherwise. Behaves like --ff.
Merges changes, but does not commit them. Behaves like --no-commit.
Only merges if a fast-forward is possible. Behaves like --ff-only.
Squashes the merged changes into one set and leaves them uncommitted. Behaves like --squash.
Groovy Documentation