2011-05-09 69 views
3

我有一个项目在git中,部署到heroku。远程URL是[email protected]:myappname.git和git的/配置是这样的:Git - 使开发和主跟踪不同的回购。明智?

[core] 
    repositoryformatversion = 0 
    filemode = true 
    bare = false 
    logallrefupdates = true 
[remote "origin"] 
    fetch = +refs/heads/*:refs/remotes/origin/* 
    url = [email protected]:myappname.git 
[branch "master"] 
    remote = origin 
    merge = refs/heads/master 

我只是做了所谓的“myappname分期”,我想作为一个临时站点为这个应用程序使用一个新的Heroku应用程序。我在想,我会设置它,以便“主”分支推送到生产遥控器,“开发”分支推到分段遥控器。这是处理这种情况的合理/常规方法吗?

我不能完全弄清楚如何做到这一点。当我提出在Heroku上的升级程序的时候,给了我这个回:

Creating myappname-staging.... done 
http://myappname-staging.heroku.com/ | [email protected]:myappname-staging.git 
Git remote heroku added 

而且我的配置现在看起来是这样的:

[core] 
    repositoryformatversion = 0 
    filemode = true 
    bare = false 
    logallrefupdates = true 
[remote "origin"] 
    fetch = +refs/heads/*:refs/remotes/origin/* 
    url = [email protected]:myappnamestef.git 
[branch "master"] 
    remote = origin 
    merge = refs/heads/master 
[remote "heroku"] 
    url = [email protected]:myappname-staging.git 
    fetch = +refs/heads/*:refs/remotes/heroku/* 
[remote "staging"] 
    url = [email protected]:myappname-staging.git 
    fetch = +refs/heads/*:refs/remotes/staging/* 

任何人都可以让我直?

感谢,最大

回答

5

补充一点:

[branch "development"] 
    remote = staging 
    merge = refs/heads/master 

你可以做,在命令行通过:

$ git config branch.development.remote staging 
$ git config branch.development.merge refs/heads/master 

将在development分公司设立跟踪master分支在舞台上。

+0

很好,谢谢mipadi!有一种感觉可能是这样的,但在我去之前要检查一下并且制作我们的制作应用程序:)干杯 – 2011-05-09 19:02:27