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

[David Engster]

Andreas Schwab writes:
> address@hidden writes:
>
>> The thing I thought I did was merging from the feature branch to master,
>> and then push master.
>
> No, you did exactly the other way round:
>
> commit 69815df
> Merge: 4edad42 a2c32b0
> Author: Joakim Verona <address@hidden>
> Date:   Sun Feb 1 00:37:46 2015 +0100
>
>     Merge branch 'master' into xwidget

Yes, but I'm willing to bet he actually *did* switch to 'master'
afterwards and did

  git merge xwidget

which was then however resolved as 'fast-forward', so you don't see it.

-David