feat: introduce global merge message templates (#8347)

Browse source

Allow for a directory `default_merge_message` in the `CustomPath` to be used as a fallback if no merge template is specified by the repository. Effectively being a global merge message template feature.

Resolves #6648

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8347
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Co-authored-by: kochklops <kochklops@noreply.codeberg.org>
Co-committed-by: kochklops <kochklops@noreply.codeberg.org>

...

This commit is contained in:

kochklops 2025-07-12 16:00:42 +02:00 • committed by Gusted

parent f666b882a8

commit 9f5e1157f0

20 changed files with 148 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

modules/git/tests/repos/templates_repo/index Normal file

View file

Binary file not shown.