From b35760ec3ec730e42876b0a94646cd27f1d412b6 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Wed, 26 Jun 2024 09:36:55 +0200 Subject: [PATCH] systemd: update upstream reference section --- docs/SYSTEMD_CONTRIBUTING.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/SYSTEMD_CONTRIBUTING.md b/docs/SYSTEMD_CONTRIBUTING.md index 3c047e5..28466fa 100644 --- a/docs/SYSTEMD_CONTRIBUTING.md +++ b/docs/SYSTEMD_CONTRIBUTING.md @@ -33,12 +33,20 @@ Every Pull Request has to comply with the following rules: ### Upstream reference When doing a back-port of an upstream commit, always use `cherry-pick -x `. Consider proposing a change upstream first when an upstream commit doesn't exist. -If the change isn't upstream relevant or accepted by upstream, mark the commit with the `rhel-only` string. +If the change isn't upstream relevant or accepted by upstream, mark the commit with the `rhel-only: ` string, where a `` is: + +- `feature` - for feature-related commits (cross-version) +- `bugfix` - for bugfix-related commits (cross-version) +- `doc` - for documentation-related commits (usually version-specific) +- `workaround` - for workaround-related commits (usually version-specific) +- `ci` - for CI-related commits (version-specific) +- `test` - for test-related commits (version-specific) +- `other` - for commits that do not fit into any of the above categories (version-specific) ```md doc: Fix TYPO -rhel-only +rhel-only: doc Resolves: RHEL-678 ```