aboutsummaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-08-05 19:00:12 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-08-05 19:00:12 +0300
commit377fc0352a5b573403d5be0731beb84a77951cf6 (patch)
tree5f85e1d67aefbb859357bd86b1c4f375f5bc3435 /CONTRIBUTING.md
parentc3eb17db74097c49ab3892a53857dfa24937833b (diff)
parent304e294ea701e595b21c0a8a8236ca53828f2b3b (diff)
downloadPrismLauncher-377fc0352a5b573403d5be0731beb84a77951cf6.tar.gz
PrismLauncher-377fc0352a5b573403d5be0731beb84a77951cf6.tar.bz2
PrismLauncher-377fc0352a5b573403d5be0731beb84a77951cf6.zip
Merge branch 'staging' of https://github.com/PrismLauncher/PrismLauncher into icons
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.