| Message ID | 1398799827-13701-1-git-send-email-wbx@openadk.org |
|---|---|
| State | Accepted |
| Headers | show |
On 29/04/14 21:30, Waldemar Brodkorb wrote: > 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. > > Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> > --- > docs/manual/contribute.txt | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt > index 47494cb..7795e71 100644 > --- a/docs/manual/contribute.txt > +++ b/docs/manual/contribute.txt > @@ -230,6 +230,8 @@ 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 using +git rebase+ > +in interactive mode. If you're making such a suggestion, it's good to provide just a little bit more information: The best thing to rework a patch series is by interactive rebasing: +git rebase -i origin/master+. Consult the git manual for more information. Regards, Arnout > > When added to the individual commits, this changelog is added when > editing the commit message. Below the +Signed-off-by+ section, add >
Dear Waldemar Brodkorb, On Tue, 29 Apr 2014 21:30:27 +0200, Waldemar Brodkorb wrote: > 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. > > Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> > --- > docs/manual/contribute.txt | 2 ++ > 1 file changed, 2 insertions(+) Applied after taking into account Arnout's comment. Next time, please use a better commit title such as: docs/manual: give a hint about git rebase Thanks, Thomas
diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index 47494cb..7795e71 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -230,6 +230,8 @@ 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 using +git rebase+ +in interactive mode. When added to the individual commits, this changelog is added when editing the commit message. Below the +Signed-off-by+ section, add
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. Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> --- docs/manual/contribute.txt | 2 ++ 1 file changed, 2 insertions(+)