Re: Re: Merge with git-pasky II.

From: Christopher Li <git@chrisli.org>
Date: Apr 14, 2005, 01:23 UTC
Message-ID: <20050414012352.GA17700@64m.dyndns.org>
In-Reply-To: <Pine.LNX.4.58.0504132020550.7211@ppc970.osdl.org>

On Wed, Apr 13, 2005 at 08:51:50PM -0700, Linus Torvalds wrote:

Show 14 quoted lines

> 
> 
> On Thu, 14 Apr 2005, Petr Baudis wrote:
> 
> Thick skin is the name of the game. I'd not get any work done otherwise.
> 
> On that note - I've been avoiding doing the merge-tree thing, in the hope 
> that somebody else does what I've described. I really do suck at scripting 
> things, yet this is clearly something where using C to do a lot of the 
> stuff is pointless.
> 
> Almost all the parts do seem to be there, ie Daniel did the "common 
> parent" part, and the rest really does seem to be more about scripting 
> than writing more C plumbing stuff..

Do you have preference about what language of script we used? I actually hesitated to introduce my Python script to git.

I can build some script extension for git just like the one I did for sparse, is that some thing you want to see?

Chris