diff options
| author | ttys3 <41882455+ttys3@users.noreply.github.com> | 2022-06-03 11:45:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-02 23:45:54 -0400 |
| commit | 0c759fd4dee1c2a82ecdb0a6019d8ee78dae2209 (patch) | |
| tree | 54ceb9a1bf1e750188f8cce9380e0f6a7898217e /docs/content/doc/advanced | |
| parent | 808a7803098bd86c83185cb823c5b0e2a5b2c56d (diff) | |
| download | gitea-0c759fd4dee1c2a82ecdb0a6019d8ee78dae2209.tar.gz gitea-0c759fd4dee1c2a82ecdb0a6019d8ee78dae2209.zip | |
feat: add DEFAULT_MERGE_STYLE to `repository.pull-request` section for repo init (#19751)
Diffstat (limited to 'docs/content/doc/advanced')
| -rw-r--r-- | docs/content/doc/advanced/config-cheat-sheet.en-us.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index 9d7f6c126c..2dae3526f9 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -92,6 +92,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. keywords used in Pull Request comments to automatically close a related issue - `REOPEN_KEYWORDS`: **reopen**, **reopens**, **reopened**: List of keywords used in Pull Request comments to automatically reopen a related issue +- `DEFAULT_MERGE_STYLE`: **merge**: Set default merge style for repository creating, valid options: `merge`, `rebase`, `rebase-merge`, `squash` - `DEFAULT_MERGE_MESSAGE_COMMITS_LIMIT`: **50**: In the default merge message for squash commits include at most this many commits. Set to `-1` to include all commits - `DEFAULT_MERGE_MESSAGE_SIZE`: **5120**: In the default merge message for squash commits limit the size of the commit messages. Set to `-1` to have no limit. Only used if `POPULATE_SQUASH_COMMENT_WITH_COMMIT_MESSAGES` is `true`. - `DEFAULT_MERGE_MESSAGE_ALL_AUTHORS`: **false**: In the default merge message for squash commits walk all commits to include all authors in the Co-authored-by otherwise just use those in the limited list |