From 44442520bc4e402ca8fe5fd60f2601c40f28a9a5 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Wed, 18 Nov 2020 19:41:01 -0800 Subject: [PATCH] fix numbering in contributing.rst (#16042) --- doc/contributing.rst | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/doc/contributing.rst b/doc/contributing.rst index 0e87ebc1d..90330e4f4 100644 --- a/doc/contributing.rst +++ b/doc/contributing.rst @@ -407,7 +407,6 @@ General commit rules #!/bin/sh git diff --check --cached || exit $? - 5. Describe your commit and use your common sense. Example commit message: @@ -418,11 +417,10 @@ General commit rules (e.g.: partially fixed) and won't close the issue when committed. 6. PR body (not just PR title) should contain references to fixed/referenced github - issues, e.g.: `fix #123` or `refs #123`. This is so that you get proper cross - referencing from linked issue to the PR (github won't make those links with just - PR title, and commit messages aren't always sufficient to ensure that, e.g. - can't be changed after a PR is merged). - + issues, e.g.: `fix #123` or `refs #123`. This is so that you get proper cross + referencing from linked issue to the PR (github won't make those links with just + PR title, and commit messages aren't always sufficient to ensure that, e.g. + can't be changed after a PR is merged). 7. Commits should be always be rebased against devel (so a fast forward merge can happen)