John Darrington <[EMAIL PROTECTED]> writes:
> On Wed, Oct 08, 2008 at 09:56:08PM -0700, Ben Pfaff wrote:
>
> The second way is to take the local branch that you pushed to
> origin/relocation-issues and "rebase" it onto origin/stable. If
> you have your local branch checked out at the moment, that's
> just:
>
> # Rebase against origin/stable.
> git rebase origin/stable.
>
> When I try this, I get
>
> fatal: Needed a single revision
> invalid upstream origin/stable
I can think of three possible reasons:
1. Your Git installation is quite old. For what it's
worth, I'm using 1.5.6.5 (but you needn't upgrade to
anything as new as that).
2. Your repository wasn't created by cloning the Savannah
repository but by cloning some other repository. In
that case "origin" refers to that other repository.
In such a case you can do something like:
git remote add savannah [EMAIL PROTECTED]:/srv/git/pspp.git
git fetch savannah
and then replace "origin" by "savannah" everywhere in
the recipes, e.g.
git rebase savannah/stable
3. You haven't done a "git fetch" recently enough in this
repository that the stable branch has shown up. In
that case just do "git fetch origin"
You can find out some things by running "git branch -a" to list
all the branches that Git knows about. There should be a number
of them at Savannah, e.g. when I run that command, I see:
attributes
changelogs
hmap
hmap2
hmap3
master
random
relational
* v0.6.1
cvs/master
cvs/simpler-proc
jhs/master
origin/master
origin/pre-0.6.1
origin/relocation-issues
origin/rewrite-sheet
origin/stable
--
Ben Pfaff
http://benpfaff.org
_______________________________________________
pspp-dev mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/pspp-dev
