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

[Eli Zaretskii]

> From: address@hidden
> Date: Sun, 01 Feb 2015 16:52:33 +0100
> Cc: address@hidden, Dmitry Gutov <address@hidden>
> 
> The thing I thought I did was merging from the feature branch to master,
> and then push master.

Then maybe some Git guru could explain how this happened.

> How do I dig myself out of this hole now then?

I'll defer to the Git experts.  (There's a technique to swap parents
of a merge-commit, but I'm not sure it is needed in this case,
especially if you are going to revert.)