From: Junio C Hamano <junkio@cox.net>
Date: Thu, 15 Dec 2005 23:42:06 GMT
Subject: Re: bad git pull
Message-ID: <7vzmn2kjw1.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <68948ca0512151537v2d8f22c8x962c55bd507af8cf@mail.gmail.com>

Don Zickus <dzickus@gmail.com> writes:

> I notice if I create a branch (and switch to it) in the linux kernel
> off of say version 2.6.14, then later do a git pull, things get ugly. 
> It seems like all the upstream changes are being merged into the
> 2.6.14 branch (instead of the latest kernel tag).
>
> Is this a user error because the tool is still fragile?

I do not understand the question.

The user wanted all the good developments from the mainline into
the fork he created starting at 2.6.14, and the tool did what
was asked.  Why would you want to forbid that from happening,
and what did you want to happen instead?