From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 29 Apr 2008 02:14:13 GMT
Subject: Re: my git problem
Message-ID: <20080428191413.6aa79054.akpm@linux-foundation.org>
In-Reply-To: <alpine.LFD.1.10.0804281512110.3119@woody.linux-foundation.org>

On Mon, 28 Apr 2008 15:14:20 -0700 (PDT) Linus Torvalds <torvalds@linux-foundation.org> wrote:

> 
> 
> On Mon, 28 Apr 2008, Linus Torvalds wrote:
> > 
> > I don't actually see what was wrong with the old script.  The merge was
> > really oddly done, but apart from that, something like this should work
> > (just your old script with some trivial fixes to 'git merge' and using
> > somewhat saner arguments):
> 
> Side note: you are still going to have *exactly* the same issue if you 
> have other git trees (not origin) that contain the same patch. 
> 

yup.  The same-patch-in-two-trees problem is surprisingly rare.