summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Jacobson <owen@grimoire.ca>2025-05-27 01:52:50 -0400
committerOwen Jacobson <owen@grimoire.ca>2025-05-27 02:02:42 -0400
commit25dda63aa91571f56179bdba3ca319fd96ae4216 (patch)
tree5c76b8043935732ad2c8c3afe9162eb3eb596ff1
parent79d3598282fd573931e7cb14e4d3e54aad7c943c (diff)
Use pull request bodies as merge commit bodies.
For a merge with a single incoming commit, this will generally be redundant - the default pull request subject and body are drawn from the commit itself, so they'll get repeated in the merge commit. However, for a pull request with multiple commits, the pull request title and body are likely a better merge commit message than the default offered by Codeberg. I've been doing basically this for manual merges regardless. Further reading: <https://forgejo.org/docs/latest/user/merge-message-templates/>
-rw-r--r--.forgejo/default_merge_message/MERGE_TEMPLATE.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/.forgejo/default_merge_message/MERGE_TEMPLATE.md b/.forgejo/default_merge_message/MERGE_TEMPLATE.md
new file mode 100644
index 0000000..e4d5b13
--- /dev/null
+++ b/.forgejo/default_merge_message/MERGE_TEMPLATE.md
@@ -0,0 +1,5 @@
+${PullRequestTitle}
+
+${PullRequestDescription}
+
+Merges ${HeadBranch} into ${BaseBranch}.