diff options
author | MarcoFalke <falke.marco@gmail.com> | 2021-02-22 10:05:11 +0100 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2021-02-22 09:53:01 +0100 |
commit | fa1f3a26a7541ba82a28c2a5fd09401be825c888 (patch) | |
tree | a9521a90dcf159e85107c2e16327df8bdea04e2f /CONTRIBUTING.md | |
parent | 34d70300631e775f1fe4f28ffadecfe6e2ce369b (diff) |
doc: Clarify that squashing should happen before review
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r-- | CONTRIBUTING.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2e11474382..ae2379fbd5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -197,7 +197,7 @@ Note: Code review is a burdensome but important part of the development process, If your pull request contains fixup commits (commits that change the same line of code repeatedly) or too fine-grained commits, you may be asked to [squash](https://git-scm.com/docs/git-rebase#_interactive_mode) your commits -before it will be merged. The basic squashing workflow is shown below. +before it will be reviewed. The basic squashing workflow is shown below. git checkout your_branch_name git rebase -i HEAD~n |