diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-12-24 02:13:04 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-12-24 02:13:04 +0100 |
| commit | 10600db2994b4571e6a314e404428c2e53711e92 (patch) | |
| tree | 8978fcea0a33f4ee2b6c6e4f74b2b5ddd5b4da6a /CONTRIBUTING.md | |
| parent | 8cd2d6de90ecee3d8bad4c5005a48b8e4cba3b8f (diff) | |
| download | nixpkgs-10600db2994b4571e6a314e404428c2e53711e92.tar nixpkgs-10600db2994b4571e6a314e404428c2e53711e92.tar.gz nixpkgs-10600db2994b4571e6a314e404428c2e53711e92.tar.bz2 nixpkgs-10600db2994b4571e6a314e404428c2e53711e92.tar.lz nixpkgs-10600db2994b4571e6a314e404428c2e53711e92.tar.xz nixpkgs-10600db2994b4571e6a314e404428c2e53711e92.tar.zst nixpkgs-10600db2994b4571e6a314e404428c2e53711e92.zip | |
CONTRIBUTING: add links to online resources
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b0479ed85ef..c6bc661c72b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -55,7 +55,7 @@ Package version upgrades usually allow for simpler commit messages, including at Pull requests should not be squash merged in order to keep complete commit messages and GPG signatures intact and must not be when the change doesn't make sense as a single commit. This means that, when addressing review comments in order to keep the pull request in an always mergeable status, you will sometimes need to rewrite your branch's history and then force-push it with `git push --force-with-lease`. -Useful git commands that can help a lot with this are `git commit --patch --amend` and `git rebase --interactive @~3`. For more details consult the git man pages. +Useful git commands that can help a lot with this are `git commit --patch --amend` and `git rebase --interactive`. For more details consult the git man pages or online resources like [git-rebase.io](https://git-rebase.io/) or [The Pro Git Book](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History). ## Rebasing between branches (i.e. from master to staging) |