update kernel with git

Hi, In my git repository I have a linux kernel 2.6.31 with a branch, I have
to update master branch to 2.6.32.7. 
I tried git pull path_2.6.32 master but it doesn't run, it does some
computation and then it says:
......
walk df56cb1f37415f16a187738ee9e3c03e2106e305
From http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.32.y
 * branch            master     -> FETCH_HEAD
error: Entry '.gitignore' not uptodate. Cannot merge.
fatal: merging of trees 44927d86ace5c502486e26ed828a02fea9627119 and
84637ae413afcb236f0e9060e03cdec9fa017b0b failed

The question is: Is it the correct way execute git pull .... to update my
2.6.31 git kernel?

Thanks
Bye

-- 
View this message in context: http://n2.nabble.com/update-kernel-with-git-tp4503539p4503539.html
Sent from the git mailing list archive at Nabble.com.