aboutsummaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorTheKodeToad <TheKodeToad@proton.me>2023-08-02 20:27:37 +0100
committerGitHub <noreply@github.com>2023-08-02 20:27:37 +0100
commitafaf6f894c797fc0aa7eb329b661b533be469005 (patch)
tree0be358a0b616010aa5a022dbd3336a15cb791638 /CONTRIBUTING.md
parent8b3c465a50e6be2a09c3968f1fd1e91b0428cbb0 (diff)
parentac36a2289faf331af17b51e2c9ebb78d005f9bfa (diff)
downloadPrismLauncher-afaf6f894c797fc0aa7eb329b661b533be469005.tar.gz
PrismLauncher-afaf6f894c797fc0aa7eb329b661b533be469005.tar.bz2
PrismLauncher-afaf6f894c797fc0aa7eb329b661b533be469005.zip
Merge branch 'PrismLauncher:develop' into better-component-installation
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md5
1 files changed, 2 insertions, 3 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b2795ce4..07291677 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,7 +19,7 @@ In an effort to ensure that the code you contribute is actually compatible with
This can be done by appending `-s` to your `git commit` call, or by manually appending the following text to your commit message:
-```
+```text
<commit message>
Signed-off-by: Author name <Author email>
@@ -27,7 +27,7 @@ Signed-off-by: Author name <Author email>
By signing off your work, you agree to the terms below:
-```
+```text
Developer's Certificate of Origin 1.1
By making a contribution to this project, I certify that:
@@ -62,7 +62,6 @@ As a bonus, you can also [cryptographically sign your commits][gh-signing-commit
[gh-signing-commits]: https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits
[gh-vigilant-mode]: https://docs.github.com/en/authentication/managing-commit-signature-verification/displaying-verification-statuses-for-all-of-your-commits
-
## Backporting to Release Branches
We use [automated backports](https://github.com/PrismLauncher/PrismLauncher/blob/develop/.github/workflows/backport.yml) to merge specific contributions from develop into `release` branches.