From: Steve French Date: Wed, 10 Aug 2005 15:05:35 +0000 (-0700) Subject: Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git X-Git-Tag: v2.6.15-rc1~18^2~35^2~5^2~58 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a47fd3f5e3a3f970ac1b81643ac56737f97a1fea;p=linux-2.6-omap-h63xx.git Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git french@hera:~/linux-2.6(0)$ cg-update l `/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/refs/heads/master' -> `.git/refs/heads/origin' cp: cannot create link `.git/objects/info/packs': File exists progress: 213 objects, 646653 bytes, 77% done `/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/objects/info/packs' -> `.git/objects/info/packs' progress: 983 objects, 2805763 bytes, 100% done cg-pull: objects pull failed --- a47fd3f5e3a3f970ac1b81643ac56737f97a1fea