2008-08-28 05:38:52

by Peter Teoh

[permalink] [raw]
Subject: some problem with "git pull"

Issuing the following:

git pull git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

result in the following output:

remote: Counting objects: 354, done.
remote: Compressing objects: 100% (220/220), done.
remote: Total 354 (delta 173), reused 278 (delta 134)
Receiving objects: 100% (354/354), 603.00 KiB | 10 KiB/s, done.
Resolving deltas: 100% (173/173), done.
* non-commit: keep
a72c497614f3fec7453b826b33ab0303c3c087fc of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
* committish: 4c246edd2550304df5b766cc841584b2bb058843
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
fatal: Error in line 1: keep not-for-merge
a72c497614f3fec7453b826b33ab0303c3c087fc of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

I cannot find anything in the Internet for the above error, anyone can help?

Thank you very much.

--
Regards,
Peter Teoh