hardy: git pull errors

[Tim Gardner]

Christian Kujau wrote:
> On Sun, 21 Dec 2008, Tim Gardner wrote:
>> git checkout -f
>> git clean -f -d
>> git reset --hard Ubuntu-2.6.24-16.30
>> git fetch origin
>> git rebase origin
> 
> Thanks for the reply, unfortunately it did not resolve my issue, git
> pull still fails: http://nerdbynature.de/bits/git/screenlog.2.txt
> 
> Btw, there's no -f option to my git-clean, I'm still on git-1.4.4.4,
> could this old version be an issue here?
> 
> Christian.

Don't do a 'git pull'. Your tree is up to date after 'git rebase origin'

rtg
-- 
Tim Gardner tim.gardner at canonical.com