Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a90356e08a99
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c32c613df691
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 26, 2020

  1. CONTRIBUTING.md: Improve backport instructions

    @davidak
    davidak committed Apr 26, 2020
    1

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: CED392DE0C483D00
    Learn about vigilant mode
    Copy the full SHA
    9c32e5c View commit details

Commits on Apr 27, 2020

  1. Merge pull request #85727 from davidak/patch-2

    @Mic92
    Mic92 authored Apr 27, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: CED392DE0C483D00
    Learn about vigilant mode
    Copy the full SHA
    c32c613 View commit details
Showing with 5 additions and 4 deletions.
  1. +5 −4 .github/CONTRIBUTING.md
9 changes: 5 additions & 4 deletions .github/CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
@@ -50,12 +50,13 @@ For package version upgrades and such a one-line commit message is usually suffi

## Backporting changes

To [backport a change into a release branch](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches):
Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches).

1. Take note of the commit in which the change was introduced into `master`.
1. Take note of the commits in which the change was introduced into `master` branch.
2. Check out the target _release branch_, e.g. `release-20.03`. Do not use a _channel branch_ like `nixos-20.03` or `nixpkgs-20.03`.
3. Use `git cherry-pick -x <original commit>`.
4. Open your backport PR. Make sure to select the release branch (e.g. `release-20.03`) as the target branch of the PR, and link to the PR in which the original change was made to `master`.
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.
5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.03`) 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. `[20.03]`.

## Reviewing contributions