From: Andreas Krey <a.krey@gmx.de>
Date: Thu, 23 May 2013 19:25:12 GMT
Subject: Re: first parent, commit graph layout, and pull merge direction
Message-ID: <20130523192512.GR9448@inner.h.apk.li>
In-Reply-To: <20130523090657.GB23933@inner.h.apk.li>

On Thu, 23 May 2013 11:06:57 +0000, Andreas Krey wrote:
...
> ...
> > Don't do that, then.

Ouch, you're right. The problem is not actually in the
pull; only the *last* pull into a feature branch that
then get pushed back ff to master needs to be reversed.

And at that time you don't know it's the last one
-> swap parents before the push if necessary.

Andreas

-- 
"Totally trivial. Famous last words."
From: Linus Torvalds <torvalds@*.org>
Date: Fri, 22 Jan 2010 07:29:21 -0800