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

Explode short arguments

Dan Schaper 2018-01-03 16:00:30 -08:00
parent 10a87cddab
commit cd9b2a6441
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Contributing-to-the-project.md

@ -23,9 +23,9 @@ Signed-off-by: Random J Developer <random@developer.example.org>
[[How To Signoff]]
Git even has a `-s` command line option to append this automatically to your commit message:
Git even has a `-s | --signoff` command line option to append this automatically to your commit message:
`$ git commit -s -m 'This is my commit message'`
`$ git commit --signoff --message 'This is my commit message'`
[[How to amend a Signoff]]
@ -41,9 +41,9 @@ and push them to GitHub
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):
```
git rebase -i HEAD^^
git rebase --interactive HEAD^^
(interactive squash + DCO append)
git push origin -f
git push origin --force
```
Note, that in general rewriting history in this way is something that can cause issues with the review process and this should only be done to correct a DCO mistake.