0
0
Fork 0
mirror of https://codeberg.org/forgejo/docs.git synced 2025-03-13 09:58:07 -04:00

Update merge templates page

Recommend to use `.forgejo` as directory.
This commit is contained in:
Gusted 2025-01-21 12:34:56 +00:00
parent 7adc7f8b4b
commit e56fccbea1

View file

@ -8,12 +8,14 @@ origin_url: 'https://github.com/go-gitea/gitea/blob/e865de1e9d65dc09797d165a51c8
Possible file names for PR default merge message templates:
- `.gitea/default_merge_message/MERGE_TEMPLATE.md`
- `.gitea/default_merge_message/REBASE_TEMPLATE.md`
- `.gitea/default_merge_message/REBASE-MERGE_TEMPLATE.md`
- `.gitea/default_merge_message/SQUASH_TEMPLATE.md`
- `.gitea/default_merge_message/MANUALLY-MERGED_TEMPLATE.md`
- `.gitea/default_merge_message/REBASE-UPDATE-ONLY_TEMPLATE.md`
- `.forgejo/default_merge_message/MERGE_TEMPLATE.md`
- `.forgejo/default_merge_message/REBASE_TEMPLATE.md`
- `.forgejo/default_merge_message/REBASE-MERGE_TEMPLATE.md`
- `.forgejo/default_merge_message/SQUASH_TEMPLATE.md`
- `.forgejo/default_merge_message/MANUALLY-MERGED_TEMPLATE.md`
- `.forgejo/default_merge_message/REBASE-UPDATE-ONLY_TEMPLATE.md`
Note: `.gitea` as the root directory is also recognised and kept only for compatibility reasons.
## Variables