Skip to contentSkip to conversation

give a hint about git rebase

PATCH New Waldemar Brodkorb 3 participants 3 messages Apr 29, 2014 – Jul 15, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 docs/manual/contribute.txt |    2 ++
 1 file changed, 2 insertions(+)
docs/manual/contribute.txt +2 -0
index 47494cb..7795e71 100644
@@ -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
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 give a hint about git rebase

Quoted 14 lines · Waldemar Brodkorb

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.

---
 docs/manual/contribute.txt |    2 ++
 1 file changed, 2 insertions(+)
docs/manual/contribute.txt +0 -0
index 47494cb..7795e71 100644

docs/manual/contribute.txt should include a changelog of the modifications between each · line 234

Quoted 5 lines
docs/manual/contribute.txt +2 -0
@@ -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

Quoted 4 lines
docs/manual/contribute.txt +0 -0
 When added to the individual commits, this changelog is added when
 editing the commit message.  Below the +Signed-off-by+ section, add
 
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#2 lore raw

PATCH 1/1 give a hint about git rebase

In reply to Waldemar Brodkorb

Dear Waldemar Brodkorb,

Quoted 8 lines · Waldemar Brodkorb

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.

---
 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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com