Re: b4 submit ready for beta testing

[Jason Gunthorpe <jgg@ziepe.ca>]

On Wed, Jul 20, 2022 at 04:42:44PM -0700, Junio C Hamano wrote:
 
> On Wed, Jul 20, 2022 at 4:41 PM Linus Torvalds <torvalds@linuxfoundation.org> wrote:
> >
> > On Wed, Jul 20, 2022 at 4:39 PM Jason Gunthorpe <jgg@ziepe.ca> wrote:
> > >
> > > If the cover letter is the last commit then 'git commit --amend'
> > > allows editing it as easily as 'git branch --edit description'.
> >
> > .. and what about adding new commits during development?
> >
> > That sounds oh-so-*very* inconvenient.
>
> "git rebase -i" is your friend ;-)

Yeah, exactly.

New commits are not even that likely to be added at the end of the
series anyhow. A new commit needs to be added at the logical place it
belongs in the sequence, so someone should already be proficient using
rebase to shuffle commit order around.

Either write the commit at the end and 'rebase -i' it into place, or
'rebase -i' with "edit" to directly author it where it belongs.

An empty commit is trivial to reorder with 'rebase -i' - guarenteed no
conflicts :)

And when there are issues in the commits I generally end up with
fixup! commits and repeated "rebase -i --autosquash"'s until the
series is done.

I'm getting the impression that people are building series in git
without using a lot of 'rebase -i' ? How is this done ?

Jason