diff options
| author | Julian <julian.toelle97@gmail.com> | 2018-12-27 11:27:08 +0100 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2018-12-27 12:27:08 +0200 |
| commit | 4a685f8b872a3d4c101c5e8165fa99e696c8fb45 (patch) | |
| tree | 7ad36ee9bf87cec61ee0967a50037d9331d2ab58 /options | |
| parent | 58bdff53cd98e33791f91584d02887864aabc5c4 (diff) | |
| download | gitea-4a685f8b872a3d4c101c5e8165fa99e696c8fb45.tar.gz gitea-4a685f8b872a3d4c101c5e8165fa99e696c8fb45.zip | |
Add rebase with merge commit merge style (#3844) (#4052)
Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 1a748e8b20..5013e0a94b 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -868,6 +868,7 @@ pulls.no_merge_helper = Enable merge options in the repository settings or merge pulls.no_merge_wip = This pull request can not be merged because it is marked as being a work in progress. pulls.merge_pull_request = Merge Pull Request pulls.rebase_merge_pull_request = Rebase and Merge +pulls.rebase_merge_commit_pull_request = Rebase and Merge (--no-ff) pulls.squash_merge_pull_request = Squash and Merge pulls.invalid_merge_option = You cannot use this merge option for this pull request. pulls.open_unmerged_pull_exists = `You cannot perform a reopen operation because there is a pending pull request (#%d) with identical properties.` @@ -1013,6 +1014,7 @@ settings.pulls_desc = Enable Repository Pull Requests settings.pulls.ignore_whitespace = Ignore Whitespace for Conflicts settings.pulls.allow_merge_commits = Enable Commit Merging settings.pulls.allow_rebase_merge = Enable Rebasing to Merge Commits +settings.pulls.allow_rebase_merge_commit = Enable Rebasing with explicit merge commits (--no-ff) settings.pulls.allow_squash_commits = Enable Squashing to Merge Commits settings.admin_settings = Administrator Settings settings.admin_enable_health_check = Enable Repository Health Checks (git fsck) |