Git Guidelines

For instructions on basic usage, see Git.

Upstream commit rules

1. You can push something to upstream [1] only if some other member of the core development team agrees on it [2]
2. Commit messages must look good and be in the present tense (look at the commit log)
3. Do not modify history older than 10 minutes
4. Use rebase, not merge, to get linear history. [3]

Notes

[1] Upstream is at https://github.com/minetest

[2] The team: https://github.com/minetest?tab=members

[3] For a github pull request, this is easiest done by appending .patch to the pull request URL, wgetting it to your project directory and doing git am whatever.patch. Similarly for single commits.