On Fri, Jun 12, 2009 at 12:32, Philippe Gerum wrote:
> On Fri, 2009-06-12 at 12:05 -0400, Mike Frysinger wrote:
>> On Fri, Jun 12, 2009 at 11:54, Philippe Gerum wrote:
>> > More specifically, which one shall I pull your changes from?
>> boom:
>> http://git.kernel.org/?p=linux/kernel/git/vapier/blackfin.git;a=shortlog;h=trunk
> Hey, nice, you just allowed me to eat 738Mb of disk space!

hmm maybe i should run gc/pack on the tree and prune unreferenced objects.

>> currently i rebase this branch as i treat it as a set of patches on
>> top of the upstream branch.  but if you only have one patch to
>> maintain against these sources, that shouldnt be too much of a problem
>> ... you can pop/push it ...
>> if that really is a hassle for you though, i can look at making a
>> branch that is full of ugly merge commits and keep my patch series in
>> a different branch ...
> That should be ok; I have a single patch and this is fine as long as I
> am able to rebase it on the next tree; I don't need much linear history
> here. I will send the arch-dep part of it for inclusion as usual, the
> rest landing on the bfin_patch/ area IIRC.

git rebase has an --onto option which should let you do it.  git am -3
also does a pretty good job.  but if it does get to be a hassle, lemme

Xenomai-core mailing list

Reply via email to