diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-29 21:30:27 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-07-15 23:40:07 +0200 |
| commit | b41ec531c2be1b57712cf1c7402842348cd5b5b5 (patch) | |
| tree | 118af8b66ea2efe8edf92973f43a2fb9b960e1fe /docs/manual | |
| parent | 95c914fae8ff20dac278aea9ae0d74595bf03b88 (diff) | |
| download | buildroot-b41ec531c2be1b57712cf1c7402842348cd5b5b5.tar.gz buildroot-b41ec531c2be1b57712cf1c7402842348cd5b5b5.zip | |
give a hint about git rebase
It seems common knowledge to use git rebase in interactive mode
to fixup issues while respinning patch series, but I found it hard
to find any hint about it. Add a note for git beginners like me.
[Thomas: take into account Arnout's comment.]
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'docs/manual')
| -rw-r--r-- | docs/manual/contribute.txt | 3 |
1 files changed, 3 insertions, 0 deletions
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 |
