diff options
| author | Florian Zschocke <florian.zschocke@cycos.com> | 2014-06-21 02:53:21 +0200 |
|---|---|---|
| committer | Florian Zschocke <florian.zschocke@devolo.de> | 2016-10-28 11:02:25 +0200 |
| commit | 5c44219084e825feea72c60a83bc6889e3cf1bc9 (patch) | |
| tree | 1c2262cc18f54fa0d08579abbdd109dc3a9b54aa /src/main/java/com/gitblit/models/SubmoduleModel.java | |
| parent | d10fe0d8fd614f6ae6606179b0326bdc6a5f6af8 (diff) | |
| download | gitblit-5c44219084e825feea72c60a83bc6889e3cf1bc9.tar.gz gitblit-5c44219084e825feea72c60a83bc6889e3cf1bc9.zip | |
Add integration strategy to merge tickes fast-forward or with commit.
Add the option to merge a ticket branch to the integration branch
only when it can be fast-forwarded, or
always with a merge commit, or
by fast-foward if possible, otherwise with a merge commit.
Adds a new property ticket.mergeType with the valid values
FAST_FOWARD_ONLY, MERGE_ALWAYS and MERGE_IF_NECESSARY.
Merging and canMerge were refactored to make use of a new
IntegrationStrategy class for each type of strategy.
Diffstat (limited to 'src/main/java/com/gitblit/models/SubmoduleModel.java')
0 files changed, 0 insertions, 0 deletions