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

[Ulrich Mueller]

>>>>> On Mon, 02 Feb 2015, David Engster wrote:

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

That's probably the best what can be done without rewriting the
history. It should be done soon, though.

Ulrich