我在Github上创建了一个Git仓库,并在家里克隆了它:
- 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
在工作中,我已经克隆了该存储库,进行了几次提交,并推送回 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
现在当我在家尝试拉取时,git 对分支感到困惑:
- 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)上不需要这样做呢?
谢谢!