diff options
| author | Albert ARIBAUD <aaribaud@users.noreply.github.com> | 2021-08-02 21:23:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 20:23:57 +0100 |
| commit | a51cb3d4cbb1ff5072979cf84edd9b6d361adefd (patch) | |
| tree | efd7354ec8fd87fd87e9158ce5e900508a4f5c21 | |
| parent | 1fc7d6d6ad2fe85a28aff6dd14e41da8ee769f31 (diff) | |
| download | gitea-a51cb3d4cbb1ff5072979cf84edd9b6d361adefd.tar.gz gitea-a51cb3d4cbb1ff5072979cf84edd9b6d361adefd.zip | |
Make PR merge options more intuitive (#5863) (#16582)
Reword options making clear whether the PRed branch is rebased or not, and which type of commit will be created if any.
| -rw-r--r-- | options/locale/locale_en-US.ini | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 96fda97dda..23d7b23878 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1437,10 +1437,10 @@ 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.no_merge_not_ready = This pull request is not ready to be merged, check review status and status checks. pulls.no_merge_access = You are not authorized to merge this pull request. -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.merge_pull_request = Create merge commit +pulls.rebase_merge_pull_request = Rebase then fast-forward +pulls.rebase_merge_commit_pull_request = Rebase then create merge commit +pulls.squash_merge_pull_request = Create squash commit pulls.merge_manually = Manually merged pulls.merge_commit_id = The merge commit ID pulls.require_signed_wont_sign = The branch requires signed commits but this merge will not be signed |