16 Commits

Include renames

Author	SHA1	Message	Date
julian	e2fa915bdd	workflow: do not use squashed merging	2025-03-23 18:53:37 +01:00
Gitea Actionsandjulian	2be2381cc0	Merge main branch squashed 2025-03-22	2025-03-23 18:53:37 +01:00
julian	fc412f2596	workflow: use rebase instead of merge	2025-03-23 18:51:49 +01:00
julian	c9862e6efc	workflow: change cron time	2025-03-22 10:51:21 +01:00
julian	ed52562b55	workflow: use git diff --cached	2025-03-22 10:51:13 +01:00
julian	8d9892e958	workflow: Simplify automatic merge conflict solving	2025-03-22 09:03:05 +01:00
julian	489b839452	Workflow: automatically solve merge conflict	2025-03-22 08:58:58 +01:00
julian	3801bbda11	remove unnecessary git push	2025-03-22 08:46:34 +01:00
julian	a2a3d2586c	workflow: fix merge conflict failing script	2025-03-22 08:44:58 +01:00
julian	2ac3af7a53	workflow: first check if merge is necessary	2025-03-22 08:42:55 +01:00
julian	b0b6ef6bba	workflow: use merge instead of rebase	2025-03-22 08:34:16 +01:00
julian	595a9761d0	workflow: use --force-with-lease instead of -f	2025-03-22 08:05:24 +01:00
julian	9fa984aa14	workflow: use force pushing	2025-03-22 07:40:30 +01:00
julian	4cce287379	workflow: rebase instead of reset to fix git push	2025-03-22 07:34:19 +01:00
julian	239eaa7dd6	Workflow: refer to main instead of master	2025-03-21 22:37:56 +01:00
julian	87a3de6b98	Add gitea action to update flake daily	2025-03-21 22:36:31 +01:00