From: "Sean Kelley" <svk.sweng@gmail.com>
To: VMiklos <vmiklos@frugalware.org>
Cc: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: Cherry-picking to remote branches
Date: Fri, 6 Jul 2007 10:10:00 -0500 [thread overview]
Message-ID: <a2e879e50707060810v6b3f0a9ctda4f3fa12c284e0e@mail.gmail.com> (raw)
In-Reply-To: <20070706150155.GV32766@genesis.frugalware.org>
Hi,
On 7/6/07, VMiklos <vmiklos@frugalware.org> wrote:
> Na Fri, Jul 06, 2007 at 09:39:47AM -0500, Sean Kelley <svk.sweng@gmail.com> 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
That creates a new head on my remote server. Where as I wanted to
push to the remotes head.
Sean
>
> VMiklos
>
> --
> developer of Frugalware Linux - http://frugalware.org
>
>
next prev parent reply other threads:[~2007-07-06 15:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-06 14:09 Cherry-picking to remote branches Sean Kelley
2007-07-06 14:26 ` Johannes Schindelin
2007-07-06 14:39 ` Sean Kelley
2007-07-06 15:01 ` VMiklos
2007-07-06 15:10 ` Sean Kelley [this message]
2007-07-07 13:00 ` Sean Kelley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a2e879e50707060810v6b3f0a9ctda4f3fa12c284e0e@mail.gmail.com \
--to=svk.sweng@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=vmiklos@frugalware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).