Earl Warren
ffdba30a62
strategy: ort The strategy is changed from "recursive" to "ort", which is the default for git >= 2.43.2 and claims to reduce the likelyhood of conflicts according to man git-merge: > This has been reported to result in fewer merge conflicts without > causing mismerges... strategy-option: find-renames The default option are the same for both strategies and "theirs" will: > This option forces conflicting hunks to be auto-resolved > cleanly by favoring their version. "their" being whatever is not in the commits being cherry-picked. In the context of Forgejo backports, this is not what is desired: whenever a conflict happens it needs to be manually resolved and prefering whatever is in the stable branch will not lead to a sane backport. It is changed back to "find-renames" which is documented to be the default: > Turn on rename detection, optionally setting the similarity > threshold. This is the default. Fixes: https://codeberg.org/forgejo/forgejo/issues/2886 |
||
|---|---|---|
| .devcontainer | ||
| .forgejo | ||
| .gitea | ||
| assets | ||
| build | ||
| cmd | ||
| contrib | ||
| custom/conf | ||
| docker | ||
| docs | ||
| manual-testing@877d11b403 | ||
| models | ||
| modules | ||
| options | ||
| public | ||
| releases/images | ||
| routers | ||
| services | ||
| templates | ||
| tests | ||
| tools | ||
| web_src | ||
| .air.toml | ||
| .changelog.yml | ||
| .deadcode-out | ||
| .dockerignore | ||
| .editorconfig | ||
| .eslintrc.yaml | ||
| .gitattributes | ||
| .gitignore | ||
| .gitmodules | ||
| .gitpod.yml | ||
| .golangci.yml | ||
| .ignore | ||
| .markdownlint.yaml | ||
| .npmrc | ||
| .spectral.yaml | ||
| .stylelintrc.yaml | ||
| .yamllint.yaml | ||
| BSDmakefile | ||
| build.go | ||
| CHANGELOG.md | ||
| CODEOWNERS | ||
| CONTRIBUTING.md | ||
| DCO | ||
| Dockerfile | ||
| Dockerfile.rootless | ||
| go.mod | ||
| go.sum | ||
| LICENSE | ||
| main.go | ||
| MAINTAINERS | ||
| Makefile | ||
| package-lock.json | ||
| package.json | ||
| playwright.config.js | ||
| poetry.lock | ||
| poetry.toml | ||
| pyproject.toml | ||
| README.md | ||
| RELEASE-NOTES.md | ||
| renovate.json | ||
| tailwind.config.js | ||
| updates.config.js | ||
| vitest.config.js | ||
| webpack.config.js | ||
Welcome to Forgejo
Hi there! Tired of big platforms playing monopoly? Providing Git hosting for your project, friends, company or community? Forgejo (/for'd͡ʒe.jo/ inspired by forĝejo – the Esperanto word for forge) has you covered with its intuitive interface, light and easy hosting and a lot of builtin functionality.
Forgejo was created in 2022 because we think that the project should be owned by an independent community. If you second that, then Forgejo is for you! Our promise: Independent Free/Libre Software forever!
What does Forgejo offer?
If you like any of the following, Forgejo is literally meant for you:
- Lightweight: Forgejo can easily be hosted on nearly every machine. Running on a Raspberry? Small cloud instance? No problem!
- Project management: Besides Git hosting, Forgejo offers issues, pull requests, wikis, kanban boards and much more to coordinate with your team.
- Publishing: Have something to share? Use releases to host your software for download, or use the package registry to publish it for docker, npm and many other package managers.
- Customizable: Want to change your look? Change some settings? There are many config switches to make Forgejo work exactly like you want.
- Powerful: Organizations & team permissions, CI integration, Code Search, LDAP, OAuth and much more. If you have advanced needs, Forgejo has you covered.
- Privacy: From update checker to default settings: Forgejo is built to be privacy first for you and your crew.
- Federation: (WIP) We are actively working to connect software forges with each other through ActivityPub, and create a collaborative network of personal instances.
Learn more
Dive into the documentation, subscribe to releases and blog post on our website, find us on the Fediverse or hop into our Matrix room if you have any questions or want to get involved.
Get involved
If you are interested in making Forgejo better, either by reporting a bug or by changing the governance, please take a look at the contribution guide.