[Olsr-dev] Possible to fix errors in git repo?

[Ferry Huberts]

On 06/15/2011 11:03 AM, Henning Rogge wrote:
> On Wed June 15 2011 10:45:14 Ferry Huberts wrote:
>> you'll want to do a git rebase -i and then remove all commits of the old
>> tree that are not in your branch that you want to rebase: all commit
>> sha's are different so removing the old commits is needed: you have to
>> look up the common ancestor yourself.
>>
>> example:
>>
>> old:
>> a-b-c-d-e-f (master)
>>      \
>>       u-v-w (your branch)
>>
>>
>> new:
>> k-l-m-n-o-p
>>
>> git checkout your branch
>> git rebase -i m
>>
>> you'll (probably) get a list like:
>> a
>> b
>> c
>> u
>> v
>> w
>>
>> and you'll have to remove a-b-c
>> finally you can push your branch into the repo
> You are aware that you are talking about 500+ commits to remove? I don't think 
> "removing them by hand" is not a realistic sollution.
> 
> Henning Rogge

in vim you type:
d500<enter>


-- 
Ferry Huberts