-
Notifications
You must be signed in to change notification settings - Fork 1
Open
Labels
Description
Having the upstream first causes things like this in GitX:
Right now the .git/config file looks like this:
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
precomposeunicode = false
[remote "upstream"]
url = git@github.com:marquee/runtime.git
fetch = +refs/heads/*:refs/remotes/upstream/*
[branch "master"]
remote = upstream
merge = refs/heads/master
[remote "origin"]
url = git@git.droptype.com:tagtagtag-marquee-runtime.git
fetch = +refs/heads/*:refs/remotes/origin/*
[remote "heroku"]
url = git@heroku.com:tagtagtag-marquee-runtime.git
fetch = +refs/heads/*:refs/remotes/heroku/*
We probably want it looking more like this (note order of remotes)
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
precomposeunicode = false
[branch "master"]
remote = upstream
merge = refs/heads/master
[remote "origin"]
url = git@git.droptype.com:tagtagtag-marquee-runtime.git
fetch = +refs/heads/*:refs/remotes/origin/*
[remote "heroku"]
url = git@heroku.com:tagtagtag-marquee-runtime.git
fetch = +refs/heads/*:refs/remotes/heroku/*
[remote "upstream"]
url = git@github.com:marquee/runtime.git
fetch = +refs/heads/*:refs/remotes/upstream/*
