2011/12/31 Carl Sorensen <[email protected]>:
> I suspect that we gave you commands that set it so your local staging
> branch is tracking origin/master, rather than origin/staging. So *for
> you*, staging is the same branch as origin/master. And I'm trying to
> figure out how to diagnose this.
>
> For starters, can you look at the file .git/config (in your lilypond
> source top-level directory)?
>
> Here are my entries:
>
> [remote "origin"]
> url = [email protected]:/srv/git/lilypond.git
> fetch = +refs/heads/*:refs/remotes/origin/*
I have
[remote "origin"]
url = gnu:lilypond
fetch = +refs/heads/*:refs/remotes/origin/*
gnu: is a shortcut defined elsewhere.
> [branch "master"]
> remote = origin
> merge = master
«
[branch "master"]
remote = origin
merge = refs/heads/master
rebase = true
» here.
> [branch "staging"]
> remote = origin
> merge = refs/heads/staging
Identical, here.
>
> I think the "merge = refs/heads/staging" line is the one that ties my
> staging branch to origin/staging.
>
>
> I suspect you may have the following:
>
> [branch "staging"]
> remote = origin
> merge = master
No, I have
[branch "staging"]
remote = origin
merge = refs/heads/staging
>
> Anyway, don't panic, and we'll get this figured out.
>
> Thanks,
Thank you.
--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com
_______________________________________________
lilypond-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/lilypond-devel
