From: Michael S. Tsirkin <mst@dev.mellanox.co.il>
Date: Mon, 23 Jul 2007 09:31:42 GMT
Subject: Re: RFC: git pull or git rebase?
Message-ID: <20070723093142.GE20614@mellanox.co.il>
In-Reply-To: <81b0412b0707230207k2fa33eb3hdc23319d1f8dbd80@mail.gmail.com>

> Quoting Alex Riesen <raa.lkml@gmail.com>:
> Subject: Re: RFC: git pull or git rebase?
> 
> On 7/23/07, Michael S. Tsirkin <mst@dev.mellanox.co.il> wrote:
> >However, I wonder whether this happens to others, too.
> >Would it make sense to add a branch attribute that says
> >"do not pull this branch" or "do not rebase this branch"?
> >Maybe even make git do the right thing automatically,
> >so that git would look at this attribute and perform
> >pull or rebase as appropriate?
> 
> If you have a recent enough git, it will refuse to pull into
> a branch for which there is no configured remote branch.
> Exactly for a reason like yours.

Aha. I created the tree by git clone, so my master
is configured to merge from origin automatically.

-- 
MST