[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets
From: |
David Engster |
Subject: |
Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets |
Date: |
Sun, 01 Feb 2015 20:29:07 +0100 |
User-agent: |
Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.3.91 (gnu/linux) |
Andreas Schwab writes:
> David Engster <address@hidden> writes:
>> 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.
>
> But only because he merged from master, which was wrong to begin with.
It's a very easy mistake to make, and I'd rather say it is wrong that
Git defaults to fast-forward merges.
-David
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, (continued)
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, Eli Zaretskii, 2015/02/01
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, David Engster, 2015/02/01
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, joakim, 2015/02/01
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, David Engster, 2015/02/01
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, Eli Zaretskii, 2015/02/01
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, Andreas Schwab, 2015/02/01
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, David Engster, 2015/02/01
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, Andreas Schwab, 2015/02/01
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, joakim, 2015/02/01
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets,
David Engster <=
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, Dmitry Gutov, 2015/02/01
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, Eli Zaretskii, 2015/02/01
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, Dmitry Gutov, 2015/02/01
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, Eli Zaretskii, 2015/02/01
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, David Engster, 2015/02/02
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, Ulrich Mueller, 2015/02/02
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, Eli Zaretskii, 2015/02/02
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, Stefan Monnier, 2015/02/02
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, Stephen J. Turnbull, 2015/02/01
- Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets, Dmitry Gutov, 2015/02/01