diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index 54da1028ae..12e7f98bf6 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -222,6 +222,9 @@ should include a changelog of the modifications between each submission. Note that when your patch series is introduced by a cover letter, an overall changelog may be added to the cover letter in addition to the changelog in the individual commits. +The best thing to rework a patch series is by interactive rebasing: ++git rebase -i origin/master+. Consult the git manual for more +information. When added to the individual commits, this changelog is added when editing the commit message. Below the +Signed-off-by+ section, add