From e56fccbea1de1b4bd183d763c783dda2bf4254ab Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 21 Jan 2025 12:34:56 +0000 Subject: [PATCH] Update merge templates page Recommend to use `.forgejo` as directory. --- docs/user/merge-message-templates.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/user/merge-message-templates.md b/docs/user/merge-message-templates.md index af274c9f..ca07b12f 100644 --- a/docs/user/merge-message-templates.md +++ b/docs/user/merge-message-templates.md @@ -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