index : archiso32 | |
Archlinux32 iso tools | gitolite user |
summaryrefslogtreecommitdiff |
author | Andreas Baumann <mail@andreasbaumann.cc> | 2022-02-01 19:16:05 +0100 |
---|---|---|
committer | Andreas Baumann <mail@andreasbaumann.cc> | 2022-02-01 19:16:05 +0100 |
commit | f8112bed28161da195a57edd63f7bca132d721c8 (patch) | |
tree | 2c3f46cff54a77377bc945ac6d6af1a79ac2feaa /CONTRIBUTING.rst | |
parent | 30fa0d760efa7404b85829ac144b88aaf980525e (diff) | |
parent | a814f1484c21370cae9c9a62ac2833e8d24dd3dd (diff) |
-rw-r--r-- | CONTRIBUTING.rst | 22 |
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index bffc49d..ba8bf4a 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -19,6 +19,28 @@ All ash and bash scripts are linted using shellcheck: make lint +Changelog +========= + +When adding, changing or removing something in a merge request, add a sentence to the `CHANGELOG.rst <CHANGELOG.rst>`_ +explaining it. +The changelog entry needs to be added to the unreleased section at the top, as that section is used for the next +release. + +Merge requests and signed commits +================================= + +Merge requests are not required to contain signed commits (using ``git commit -S`` - see `man 1 git-commit +<https://man.archlinux.org/man/git-commit.1>`_). +The project maintainers may rebase a given merge request branch at their discretion (if possible), which may remove +signed commits. + +The tip of the project's default branch is required to be a signed commit by the project maintainers. +For external contributors this means, that their merge request will be merged using ``--no-ff`` (see `man 1 git-merge +<https://man.archlinux.org/man/git-merge.1>`_) in a signed merge commit, while contributions by the project maintainers +may be merged using ``--ff`` when the top-most commit of the source branch is signed by a valid PGP key of the given +maintainer. + Testing ======= |