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

[David Engster]

Eli Zaretskii writes:
>> Date: Sun, 01 Feb 2015 22:41:59 +0200
>> From: Dmitry Gutov <address@hidden>
>> Cc: address@hidden, address@hidden, address@hidden,
>
>>      address@hidden
>> 
>> 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), do a no-ff
merge of master into it and then do a fast-forward merge back:

- git checkout -b dagfix a2c32b0cfc9f6d3410e2832d8ea0d4f1df576d1e

- git merge --no-ff master

- git checkout master

- git merge dagfix

Opinions?

-David