From a0f8c6aad39669388950fe534fba5677b3e016ae Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sun, 7 Jan 2018 23:34:45 +0100 Subject: [PATCH] Recommend HEAD~2 instead of HEAD^^ --- Contributing-to-the-project.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Contributing-to-the-project.md b/Contributing-to-the-project.md index 4b9da76..7504c38 100644 --- a/Contributing-to-the-project.md +++ b/Contributing-to-the-project.md @@ -38,10 +38,10 @@ and push them to GitHub [[ 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) git push origin --force ```