Hi
On 7/6/07, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote:
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
Hth,
Dscho
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
