Note: Due to technical difficulties, the Archives are currently not up to date.
GMANE provides an alternative service for most mailing lists. c.f. bug 424647
On Fri, Apr 17, 2009 at 11:15 PM, Donnie Berkholz <dberkholz@g.o> wrote:
> I'm pretty sure we all know that. The comparison though is to the
> current case, where you just copy files across. A simple merge works
> great if your overlay is a copy of the entire tree plus a few commits,
> and you want the entire history of changes to every package merged
> across. I suspect the more common case is a small overlay with no shared
> ancestry, where you only want to merge in commits to a single package.
>
In that case, `git format-patch <then>..<now>` will give a nice set of
patches, which can then be applied regardless of ancestry. I guess a
script could be written to do this automatically ;)
--
~Nirbheek Chauhan
|
|
