Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets

[Eli Zaretskii <eliz@gnu.org>]

> From: David Engster <deng@randomsample.de>
> Cc: Dmitry Gutov <dgutov@yandex.ru>,  schwab@linux-m68k.org,  joakim@verona.se,  emacs-devel@gnu.org
> Date: Mon, 02 Feb 2015 09:03:58 +0100
> 
> >> On 02/01/2015 09:56 PM, Eli Zaretskii wrote:
> >> 
> >> > When did you last look at "git log --graph"?
> >> 
> >> My preferred alias for 'git log' contains the '--graph' argument, but I 
> >> haven't pulled the new changes yet.
> >
> > It didn't start yesterday.
> 
> I think we can at least partly fix this by simply doing what Joakim did,
> but the other way round. We create a branch from the last proper
> mainline commit Joakim merged into his branch (a2c32b0cfc)

When I said "didn't start yesterday", I meant Joakim wasn't the first
one to introduce such merges into the repository.  I see several more
merge-commits with parents in reverse order, if I look far enough back.

> - git checkout -b dagfix a2c32b0cfc9f6d3410e2832d8ea0d4f1df576d1e
> 
> - git merge --no-ff master
> 
> - git checkout master
> 
> - git merge dagfix
> 
> Opinions?

That will only fix the last instance of such merges.  But maybe we
don't care.