Compare commits

..

2 commits

Author SHA1 Message Date
b4b6647cc9 Merge pull request 'Revert "feat: default to rebase instead of creating a merge commit"' (#37) from chef/revert-rebase into main
Reviewed-on: #37
2024-06-21 10:09:08 +00:00
d9d74be24e Revert "feat: default to rebase instead of creating a merge commit"
Some checks failed
/ check (pull_request) Has been cancelled
This reverts commit ab0c9b8735.
2024-06-17 11:09:06 +02:00

View file

@ -54,10 +54,6 @@ in {
ENABLE_PUSH_CREATE_ORG = true; ENABLE_PUSH_CREATE_ORG = true;
}; };
"repository.pull-request" = {
DEFAULT_MERGE_STYLE = "rebase";
};
server = { server = {
DOMAIN = "buffets.kitchen"; DOMAIN = "buffets.kitchen";
ROOT_URL = "https://buffets.kitchen/"; ROOT_URL = "https://buffets.kitchen/";