path: root/CONTRIBUTING.rst
diff options
authorDavid P <>2022-02-09 18:44:49 -0300
committerDavid P <>2022-02-09 18:44:49 -0300
commit3358f812eb1c05484a12f287685cef13a7d3d4a0 (patch)
tree276903cfc4a0175c2522774e3d5a6beef5353918 /CONTRIBUTING.rst
parent84f3e5e706c32d4686b1fc79628498b37cbf4b02 (diff)
sync with archiso v61v61
archiso: a814f14 (HEAD -> master, tag: v61, origin/master, origin/HEAD) Add changelog for 61 5b95058 Limit CI pipelines on default branch and merge requests 549ce5b Set all build steps to be interruptable 21ca345 Limit triggering a CI build to change of non-code files cd14387 Add contributing guideline about merge requests 8d2d779 Add info about adding a changelog entry for merge requests 6c1b466 Add the installation of latest archlinux-keyring to CI 720516e configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf: update ExecStart 18bb8c2 configs/*/airootfs/etc/systemd/network/ add a comment to document why an interface name glob is used 7cbd25d Merge remote-tracking branch 'origin/merge-requests/228' 8b1788e Add linux-firmware-marvell for Surface Pro 6 wi-fi f822578 Merge branch 'weltio-master-patch-55325' of 7426192 Signed-off-by: David P <>
Diffstat (limited to 'CONTRIBUTING.rst')
1 files changed, 22 insertions, 0 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 53ee73a..9ad94ad 100644
@@ -19,6 +19,28 @@ All ash and bash scripts are linted using shellcheck:
make lint
+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
+Merge requests and signed commits
+Merge requests are not required to contain signed commits (using ``git commit -S`` - see `man 1 git-commit
+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
+<>`_) 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