Graham Percival <gra...@percival-music.ca> writes: > On Tue, Oct 25, 2011 at 10:56:23AM +0200, David Kastrup wrote: >> "m...@apollinemike.com" <m...@apollinemike.com> writes: >> >> > git mikesol@mikesol-laptop:~/lilypond-git$ git rebase origin/dev/staging >> > fatal: Needed a single revision >> > invalid upstream origin/dev/staging >> >> git branch -r lists nothing? Anyhow: I tried rebasing, deleting and >> pushing the branch about an hour ago, and pushing did not work. > > I just (well, 30-90 minute ago, can't remember) merged dev/staging > to master using your formula. That may have impacted things.
Don't think so: I think I rebased dev/staging before that. Afterwards, the merge should have just been a painless fast-forward. Weird, all in all. > Mike: try the old instructions here to get the branch: > http://lilypond.org/doc/v2.15/Documentation/contributor/downloading-remote-branches > > I will work at simplifying these, since we're suggesting that > people go with git clone and those instructions were written in > the pre-clone era. I see that my git config contains [remote "origin"] fetch = +refs/heads/*:refs/remotes/origin/* url = ssh://git.sv.gnu.org/srv/git/lilypond.git fetch = +refs/heads/dev/staging:refs/remotes/origin/dev/staging Maybe references in a subdirectory don't get found automagically? On the other hand, git branch -r lists a whole lot here. No idea. -- David Kastrup _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
