3

我在 github 上创建了一个 git repo 并在家里克隆了它：

 - eris:utility-functions$ ls
README

 - eris:utility-functions$ git status
# On branch master
nothing to commit, working directory clean

 - eris:utility-functions$ cat .git/config 
[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[remote "origin"]
        url = https://github.com/dotancohen/utility-functions.git
        fetch = +refs/heads/*:refs/remotes/origin/*

 - eris:utility-functions$ git log --pretty=oneline
d444d752ed18b9d5b8422621b841413c30159d3c first commit

在工作中，我已经克隆了 repo，做了一些提交，然后推回了 github：

 - bruno:utility-functions$ ls
example-usage.php  README.md  solr.php  util.php

 - bruno:utility-functions$ git status
# On branch master
nothing to commit (working directory clean)

 - bruno:utility-functions$ cat .git/config
[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[remote "origin"]
        fetch = +refs/heads/*:refs/remotes/origin/*
        url = https://github.com/dotancohen/utility-functions.git
[branch "master"]
        remote = origin
        merge = refs/heads/master

 - bruno:utility-functions$ git log --pretty=oneline
cbfe00402226457aed50f658126783151b074759 get_user_ip_address(): Handle multiple addresses for all types
998d57e333d0a0700539f7c6c12b9bad5536b430 get_user_ip_address(): Handle multiple addresses
6ed9d43a05ab8f0a4191da84d8025db59095f8c3 Add function for sending mail with Amazon Simple Email Service
051c8e3f4982028cef677b486b305f3057be1be4 Added get_external_ip_address() which relies on simplesniff.com.
76e574f9260cae0f9fc00ed56b9b6da5f3f37c42 Provide example usage for ensure_fields() function.
39a6471627e1be6b0351257428e634c6f45dd234 ensure_fields(): Properly document ensure_fields(): Return NULL on invalid i
c0b06fb40b86cba67edafc1454df64e4e8e9c9a2 Merge branch 'master' of https://github.com/dotancohen/utility-functions
1aa18cbdef9643f3d964a97ccda41df414e009cf Added ensure_fields() function. Added example usage page.
63840793056ce75ac0e9b7dcbcd9683980a24a2c Added ensure_fields() function. Added example usage page.
5cf5aba1fd808433570c7e4c2693acf03a0de862 Initial solr.php file. Added solr_escape() function.
5e75c0499bc4b1fe1350577726b0566d7c647a8e Initial commit

 - bruno:utility-functions$ git push
WARNING: gnome-keyring:: couldn't connect to: /run/user/dotancohen/keyring-wHsyrf/pkcs11: No such file or directory
Username for 'https://github.com': dotancohen
Password for 'https://dotancohen@github.com': 
Everything up-to-date

现在，当我尝试在家里拉时，我对分支感到困惑：

 - eris:utility-functions$ git pull
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream-to=origin/<branch> master

我很谨慎，git branch --set-upstream-to=origin/master master因为我不确定我当前的提交到底会发生什么。由于我从未更改过家用（eris）计算机上的分支，因此可能导致错误的原因是什么？在家运行命令git branch --set-upstream-to=origin/master master安全吗？为什么我不必从工作计算机 (bruno) 执行此操作？

谢谢！

4

1 回答 1

3

git branch --set-upstream-to=origin/master大师，因为我不确定我当前的提交会发生什么。

您当前对 master 的提交不会发生任何事情。

然后Agit pull将获取并合并origin/master到master。

如果你愿意，你可以git fetch先，然后在合并之前检查两个分支之间的差异。
请参阅Mark Longair的帖子“ git: fetchand merge, don'tpull ”

为什么我不必从工作计算机 (bruno) 执行此操作？

可能是因为您git push -u origin master在第一次下班时进行了推送，这会将远程跟踪分支设置为 (work) master。
有关详细信息，请参阅“为什么我需要显式推送新分支？ ”。

于 2013-06-16T10:28:36.277 回答