diff options
| author | Jimmy Praet <jimmy.praet@telenet.be> | 2022-03-04 09:30:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-04 03:30:49 -0500 |
| commit | 5184c83f6b702aeec3ea85263e16ccf5ebe89836 (patch) | |
| tree | d5a5f04630815a7342c6e26409faeac75620573b /options | |
| parent | 3c7201682cde10ed551476e13e9e1bfdd971e0c0 (diff) | |
| download | gitea-5184c83f6b702aeec3ea85263e16ccf5ebe89836.tar.gz gitea-5184c83f6b702aeec3ea85263e16ccf5ebe89836.zip | |
Add config option to disable "Update branch by rebase" (#18745)
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index f52fef3c05..6a7f9bb47c 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1786,6 +1786,7 @@ settings.pulls.allow_rebase_merge_commit = Enable Rebasing with explicit merge c settings.pulls.allow_squash_commits = Enable Squashing to Merge Commits settings.pulls.allow_manual_merge = Enable Mark PR as manually merged settings.pulls.enable_autodetect_manual_merge = Enable autodetect manual merge (Note: In some special cases, misjudgments can occur) +settings.pulls.allow_rebase_update = Enable updating pull request branch by rebase settings.pulls.default_delete_branch_after_merge = Delete pull request branch after merge by default settings.projects_desc = Enable Repository Projects settings.admin_settings = Administrator Settings |