1 |
On Fri, Apr 17, 2009 at 11:15 PM, Donnie Berkholz <dberkholz@g.o> wrote: |
2 |
> I'm pretty sure we all know that. The comparison though is to the |
3 |
> current case, where you just copy files across. A simple merge works |
4 |
> great if your overlay is a copy of the entire tree plus a few commits, |
5 |
> and you want the entire history of changes to every package merged |
6 |
> across. I suspect the more common case is a small overlay with no shared |
7 |
> ancestry, where you only want to merge in commits to a single package. |
8 |
> |
9 |
|
10 |
In that case, `git format-patch <then>..<now>` will give a nice set of |
11 |
patches, which can then be applied regardless of ancestry. I guess a |
12 |
script could be written to do this automatically ;) |
13 |
|
14 |
|
15 |
-- |
16 |
~Nirbheek Chauhan |