From: Tom Prince Date: Sun, 25 Sep 2005 22:42:58 GMT Subject: Re: GIT 0.99.7d, and end of week status. Message-ID: <87psqwzs3x.fsf@ualberta.net> In-Reply-To: <7vaci1nfwa.fsf@assigned-by-dhcp.cox.net> Junio C Hamano writes: > > When you already have a repository to track git.git, I would > recommend to have something like this in .git/remote/origin: > > URL: http://kernel.org/pub/scm/git/git.git > Pull: master:origin maint:maint +pu:pu > A warning when you do this. If you say git pull origin then your master will be updated with an octopus merge of the three heads. Tom