Skip to content

Commit

Permalink
CONTRIBUTING: add links to online resources
Browse files Browse the repository at this point in the history
  • Loading branch information
SuperSandro2000 committed Dec 24, 2022
1 parent 8cd2d6d commit 10600db
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 10600db

Please sign in to comment.