Re: problem with checking out staging branch

[Janek Warchoł]

2012/1/3 David Kastrup <address@hidden>:
> Personally, I've mostly given up with the git command line for config
> stuff.  Just post the contents of .git/config and we'll go from there,
> seeing what you should do using a text editor.

[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[branch "master"]
        remote = origin
        merge = refs/heads/master
        rebase = true
[gui]
        wmstate = normal
        geometry = 1386x631+0+51 216 192
[rietveld]
        server = codereview.appspot.com
        cc = address@hidden
        user = lemniskata.bernoullego
[branch "arp-arrow"]
        rietveldissue = 4793041
        rietveldpatchset = 1
[branch "narrow-acc"]
        rietveldissue = 4790043
        rietveldpatchset = 1
[branch "tremolo"]
        rietveldissue = 4636081
        rietveldpatchset = 49001
[remote "origin"]
        url = ssh://address@hidden/srv/git/lilypond.git
        fetch = +refs/heads/master:refs/remotes/origin/master
[remote "aspiers"]
        url = git://github.com/aspiers/lilypond.git
        fetch = +refs/heads/*:refs/remotes/aspiers/*
[branch "new-tremolo"]
[remote "testorigin"]
        url = ssh://address@hidden/srv/git/lilypond.git
        fetch = +refs/heads/*:refs/remotes/testorigin/*
[branch "staging"]
        remote = testorigin
        merge = refs/heads/staging

I guess i should change it into this:

[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[branch "master"]
        remote = origin
        merge = refs/heads/master
        rebase = true
[gui]
        wmstate = normal
        geometry = 1386x631+0+51 216 192
[rietveld]
        server = codereview.appspot.com
        cc = address@hidden
        user = janek.lilypond
[branch "arp-arrow"]
        rietveldissue = 4793041
        rietveldpatchset = 1
[branch "narrow-acc"]
        rietveldissue = 4790043
        rietveldpatchset = 1
[branch "tremolo"]
        rietveldissue = 4636081
        rietveldpatchset = 49001
[remote "origin"]
        url = ssh://address@hidden/srv/git/lilypond.git
        fetch = +refs/heads/master:refs/remotes/origin/master
[remote "aspiers"]
        url = git://github.com/aspiers/lilypond.git
        fetch = +refs/heads/*:refs/remotes/aspiers/*
[branch "new-tremolo"]
[branch "staging"]
        remote = origin
        merge = refs/heads/staging
        rebase = true

Am i right?