[1-800-GIT-HELP] Backporting a series of commits into a combined commit?

[Jakub Jelinek]

On Tue, Jun 02, 2020 at 10:53:57AM +0200, Richard Biener wrote:
> On Mon, Jun 1, 2020 at 2:17 PM Thomas Koenig via Fortran
> <fortran@gcc.gnu.org> wrote:
> >
> > Hi Martin,
> >
> > > For now, I would recommend doing 1:1 backports. Otherwise, you'll need
> > > to merge
> > > all ChangeLog entries in a format the server hook accepts. That can
> > > require some
> > > work.
> >
> > If the first commit caused a regression, which the second one fixed,
> > this would keep the first regression, right?  Is that what we want?
> 
> IMHO squashing is preferred.  Is it really so hard to do that?  You'll
> get concatenated ChangeLogs you have to merge manually, sure.
> So what?  Just do it ;)  Maybe the scripts even accept "duplicates"
> and you only have to edit out the duplicate date/author headers.

I think the problem is that Martin's script doesn't handle the
	Backported from mainline
lines and the
	date  name  email
	* whatever (something): ...

	date2  name2  email2
	* whatever (something2): ...

entries, but IMNSHO it should, because if people due to that lack of feature
just don't squash their commits, it is highly undesirable.

	Jakub