Thread (6 messages) flat view 6 messages, 3 authors, 2016-06-15

Re: Cherry-picking to remote branches

From: Sean Kelley <hidden>
Date: 2016-06-15 22:43:20

Hi

On 7/6/07, Johannes Schindelin [off-list ref] wrote:
Hi,

On Fri, 6 Jul 2007, Sean Kelley wrote:
quoted
[...]

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.

Sean
Hth,
Dscho
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help