arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-10-29 19:59:43 +00:00
Code Issues Releases Wiki Activity

Recommend HEAD~2 instead of HEAD^^

DL6ER 2018-01-07 23:34:45 +01:00
parent cd9b2a6441
commit a0f8c6aad3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Contributing-to-the-project.md

@ -38,10 +38,10 @@ and push them to GitHub
[[ DCO Failures ]] [[ DCO Failures ]]
If your Pull Request fails the DCO check, it's necessary to fix the entire commit history in the PR. Although this is a situation we'd like to avoid the best practice is to squash the commit history to a single commit, append the DCO sign-off as described [[above|How to amend a Signoff]] or interactively in the rebase comment editing process, and force push. For example, if you have 2 commits in your history (each `^` steps back one commit in the history): If your Pull Request fails the DCO check, it's necessary to fix the entire commit history in the PR. Although this is a situation we'd like to avoid the best practice is to squash the commit history to a single commit, append the DCO sign-off as described [[above|How to amend a Signoff]] or interactively in the rebase comment editing process, and force push. For example, if you have 2 commits in your history (Note the `~2`):
``` ```
git rebase --interactive HEAD^^ git rebase --interactive HEAD~2
(interactive squash + DCO append) (interactive squash + DCO append)
git push origin --force git push origin --force
``` ```