From cd9b2a644154614d70ac00c35237b43e326e1eea Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Wed, 3 Jan 2018 16:00:30 -0800 Subject: [PATCH] Explode short arguments --- Contributing-to-the-project.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Contributing-to-the-project.md b/Contributing-to-the-project.md index 8bfb8a3..4b9da76 100644 --- a/Contributing-to-the-project.md +++ b/Contributing-to-the-project.md @@ -23,9 +23,9 @@ Signed-off-by: Random J Developer [[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. \ No newline at end of file