diff options
| author | James Moger <james.moger@gmail.com> | 2016-10-28 16:04:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-28 16:04:40 -0400 |
| commit | d64dd5de6cf6385d77dcd6014f1ce48369cf9ade (patch) | |
| tree | d104751eb03d4cacce2560d4f6684836dd692379 /src/main/distrib | |
| parent | bac124176649617171a0d4be4b0a4edcfa073776 (diff) | |
| parent | 355cbb8f10527032e9c9cedbef5b68f118418d68 (diff) | |
| download | gitblit-d64dd5de6cf6385d77dcd6014f1ce48369cf9ade.tar.gz gitblit-d64dd5de6cf6385d77dcd6014f1ce48369cf9ade.zip | |
Merge pull request #1142 from fzs/merge-strategy
Merge strategy
Diffstat (limited to 'src/main/distrib')
| -rw-r--r-- | src/main/distrib/data/defaults.properties | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/main/distrib/data/defaults.properties b/src/main/distrib/data/defaults.properties index 0c7d6cd4..208fd992 100644 --- a/src/main/distrib/data/defaults.properties +++ b/src/main/distrib/data/defaults.properties @@ -567,6 +567,21 @@ tickets.acceptNewPatchsets = true # SINCE 1.4.0 tickets.requireApproval = false +# Default setting to control how patchsets are merged to the integration branch. +# Valid values: +# MERGE_ALWAYS - Always merge with a merge commit. Every ticket will show up as a branch, +# even if it could have been fast-forward merged. This is the default. +# MERGE_IF_NECESSARY - If possible, fast-forward the integration branch, +# if not, merge with a merge commit. +# FAST_FORWARD_ONLY - Only merge when a fast-forward is possible. This produces a strictly +# linear history of the integration branch. +# +# This setting can be overriden per-repository. +# +# RESTART REQUIRED +# SINCE 1.9.0 +tickets.mergeType = MERGE_ALWAYS + # The case-insensitive regular expression used to identify and close tickets on # push to the integration branch for commits that are NOT already referenced as # a patchset tip. |