Na Fri, Jul 06, 2007 at 09:39:47AM -0500, Sean Kelley <svk.sweng@xxxxxxxxx> pisal(a):
>> > git checkout -b stable linux-stable/master
>> >
>> > git cherry-pick b3b1eea69a (a commit from linux-devel)
>> >
>> > git push linux-stable
>> >
>> > error: remote 'refs/heads/master' is not a strict subset of local ref
>> > 'refs/heads/master'. maybe you are not up-to-date and need to pull
>> > first?
>> > error: failed to push to 'git://mysite.com/data/git/linux-stable.git'
>>
>> Since you are obviously only interested in pushing the stable branch, why
>> don't you
>>
>> git push linux-stable stable
>>
>> Hm?
>>
>> If you do not specify which branches to push, "git push" will find all
>> refnames which are present both locally and remotely, and push those.
>> Evidently, however, your local "master" disagrees with the remote
>> "master".
>
> It is not entirely clear to me from the documentation. So I was
> trying to cobble together something that seemed to make sense. I want
> to work from the devel clone. On occasion I want to cherry-pick
> changesets and push those to the stable branch. I don't want
> everything that goes into devel to go into stable.
what about this?
git push linux-stable stable:master
VMiklos
--
developer of Frugalware Linux - http://frugalware.org
Attachment:
pgprijd1EhSJZ.pgp
Description: PGP signature
