On Sat, 2006-11-25 at 15:53, Junio C Hamano wrote: > I am not sure if 'merge in corresponding branch' is the only > valid workflow, however. I am reluctant to make the system > automatically do so if the solution makes other workflows more > painful to follow. Automatically merging remotes/origin/$foo > when on $foo branch is not good enough, in other words (also, > there may be a hierarchy under remotes/ other than origin). It > might make sense to introduce "Merge: " in remotes/ file and if > they are present use "Pull: " only to decide what are fetched > and use "Merge: " to decide what is merged (if we were doing the > system from scratch, the former would have been named "Fetch: " > but it is too late now). Heh. It was too late back here too! From: Jon Loeliger <jdl@freescale.com> To: Git List <git@vger.kernel.org> Subject: Re: GIT 0.99.7d, and end of week status. Date: Mon, 26 Sep 2005 15:17:32 -0500 Message-Id: <1127765852.5735.36.camel@cashmere.sps.mot.com> jdl - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Thu Nov 30 08:33:32 2006
This archive was generated by hypermail 2.1.8 : 2006-11-30 08:37:15 EST