git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Sean Kelley" <svk.sweng@gmail.com>
To: git@vger.kernel.org
Subject: Cherry-picking to remote branches
Date: Fri, 6 Jul 2007 09:09:26 -0500	[thread overview]
Message-ID: <a2e879e50707060709oc9fe8b3k8e594f1cb6e10437@mail.gmail.com> (raw)

I have been having trouble with the following workflow.  I am trying
to push changes to a remote from a branch that is tracking it.

git clone git://mysite.com/data/git/linux-devel.git linux-devel

cd linux-devel

git remote add -m master -f linux-stable
git://mysite.com/data/git/linux-stable.git

git branch -r

  linux-stable/HEAD
  linux-stable/master
  origin/HEAD
  origin/master

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'

Thanks for your help,

Sean

             reply	other threads:[~2007-07-06 14:09 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-06 14:09 Sean Kelley [this message]
2007-07-06 14:26 ` Cherry-picking to remote branches Johannes Schindelin
2007-07-06 14:39   ` Sean Kelley
2007-07-06 15:01     ` VMiklos
2007-07-06 15:10       ` Sean Kelley
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=a2e879e50707060709oc9fe8b3k8e594f1cb6e10437@mail.gmail.com \
    --to=svk.sweng@gmail.com \
    --cc=git@vger.kernel.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).