From: sean Date: Thu, 09 Feb 2006 09:40:39 GMT Subject: Re: What's in git.git Message-ID: In-Reply-To: <43EB05B5.20307@op5.se> On Thu, 09 Feb 2006 10:04:53 +0100 Andreas Ericsson wrote: > I thought > > Pull: +pu:pu > > was supposed to handle such things automatically. It has always pulled > properly for me anyways. > The only problem with that is that Junio rebases and discards commits periodically that will still be in your local pu branch. The fetch/merge logic doesn't notice that commits have disappeared from Junio's pu branch. So you'll end up with a union of all the pu branches in your local repo with commits that were dropped and never merged into mainline by Junio. Unless you add changes to the pu branch locally you should never need anything but a fast forward when pulling from Junio. Except it breaks when he rebases things. The easy hackish "fix" is just to delete and repull the branch which is always small anyway. Sean