Re: Cherry-picking to remote branches

From: Sean Kelley <svk.sweng@gmail.com>
Date: Jul 6, 2007, 14:39 UTC
Message-ID: <a2e879e50707060739s4c8e751dj494618d3d545277b@mail.gmail.com>
In-Reply-To: <Pine.LNX.4.64.0707061524180.4093@racer.site>

Hi

On 7/6/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

Show 28 quoted lines

> Hi,
>
> On Fri, 6 Jul 2007, Sean Kelley wrote:
>
> > [...]
> >
> > 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

Show 5 quoted lines

>
> Hth,
> Dscho
>
>