diff options
| author | Christian Göttsche <cgzones@googlemail.com> | 2021-08-08 15:10:34 +0200 |
|---|---|---|
| committer | Christian Göttsche <cgzones@googlemail.com> | 2021-08-08 15:10:58 +0200 |
| commit | 10e9ffd8e5c353e8a04acbdfcaf0495bd130e96c (patch) | |
| tree | 569df9bd272cba9798a4dd924f6a1351acc7d0f6 /docs | |
| parent | 97a859c5bd8201911d4492e2440af1227527352d (diff) | |
Fix misc typos
[ci skip]
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/styleguide.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/styleguide.md b/docs/styleguide.md index 3757efe9..d8fe2644 100644 --- a/docs/styleguide.md +++ b/docs/styleguide.md @@ -230,7 +230,7 @@ When writing your PR or patch, the set of patches should contain the minimal cha Each patch in itself should ideally be self-contained and runable. A PR should not contain any merge commits. -To follow the uptream branch of your PR rebase your work instead. +To follow the upstream branch of your PR rebase your work instead. Avoid small commits that just fix typos that another of your commits introduced. Instead squash those changes in the appropriate commit that introduced that mistake. |