From: Petr Baudis Date: Tue, 27 Sep 2005 09:51:42 GMT Subject: Re: GIT 0.99.7d, and end of week status. Message-ID: <20050927095142.GB30889@pasky.or.cz> In-Reply-To: <1127765852.5735.36.camel@cashmere.sps.mot.com> Dear diary, on Mon, Sep 26, 2005 at 10:17:32PM CEST, I got a letter where Jon Loeliger told me that... > Hmmm... Would it make sense to introduce something > like this instead: > > # When fetching, get bits from here: > URL: http://...../git.git > # When fetching, grab and map like this: > Fetch: master:origin maint:maint +pu:pu > # When merging, merge origin, maint and pu into master > Merge: master origin maint pu > > With the intent that the "Fetch:" line effectively > limits the fetching operation to git-fetch, and doesn't > specify how to merge. Then, the "Merge:" line specifies > how to do the git-merge bits. If you didn't want to > merge in the maint and pu bits, this would have been > the line instead: > > # Merge into master the just the origin bits > Merge: master origin > > If you want the dual-step fetch+merge, the leave the "Pull:" > line as originally written: > > # Fetch and merge > Pull: master:origin maint:maint +pu:pu > > Syntax can be argued, of course. My point being to > introduce another line to the remote file that > distinguishes the default behavior for each step > along the way. Yes, this is basically the idea behind my "Default" line, but arguably nicer and more flexible. I fully agree with Junio that pulling should merge to your current branch, but I like your idea otherwise. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ VI has two modes: the one in which it beeps and the one in which it doesn't.