summary refs log tree commit diff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorfigsoda <figsoda@pm.me>2022-12-17 19:39:44 -0500
committerfigsoda <figsoda@pm.me>2022-12-17 19:39:44 -0500
commitec8cb3435824ebf8867ae3d5ad0977b4744c0c21 (patch)
tree007828e3a46976417994674995c743f63eff633d /CONTRIBUTING.md
parent6bb0dbf91feecfec45382f762206a12de23fd531 (diff)
downloadnixpkgs-ec8cb3435824ebf8867ae3d5ad0977b4744c0c21.tar
nixpkgs-ec8cb3435824ebf8867ae3d5ad0977b4744c0c21.tar.gz
nixpkgs-ec8cb3435824ebf8867ae3d5ad0977b4744c0c21.tar.bz2
nixpkgs-ec8cb3435824ebf8867ae3d5ad0977b4744c0c21.tar.lz
nixpkgs-ec8cb3435824ebf8867ae3d5ad0977b4744c0c21.tar.xz
nixpkgs-ec8cb3435824ebf8867ae3d5ad0977b4744c0c21.tar.zst
nixpkgs-ec8cb3435824ebf8867ae3d5ad0977b4744c0c21.zip
treewide: fix typos
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 46fe47e0590..b0479ed85ef 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -112,7 +112,7 @@ You can also create the backport manually:
 2. Check out the target _release branch_, e.g. `release-22.11`. Do not use a _channel branch_ like `nixos-22.11` or `nixpkgs-22.11-darwin`.
 3. Create a branch for your change, e.g. `git checkout -b backport`.
 4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe <original commit>` and add a reason. Otherwise use `git cherry-pick -x <original commit>`. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request.
-5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-22.11`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[22.11]`.
+5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-22.11`) as the target branch of the pull request, and link to the pull request in which the original change was committed to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[22.11]`.
 6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier.
 
 ## Criteria for Backporting changes