git pull,fecth,merge

来源：互联网发布：软件著作权怎么办理编辑：程序博客网时间：2024/06/04 18:13

pull=fetch+merge

git remote add upstream git@github.com:Source/joomla-azure.git
git fetch upstream //获取更新点，可以选择更新点同步代码。可用来检查worker的工作进度
git branch -a //查看所有的分支，包括远程分支
git merge remotes/upstream/master //合并选中的远程分支 remotes开头的默认不显示

git pull upstream master//直接拉取远程仓库upstream中master分支的代码

code

v-gusong@ws-bapi-bnsong MINGW64 /d/Git/phpbbcms-azure (master)$ git remote add upstream git@github.com:Source/phpbbcms-azure.gitv-gusong@ws-bapi-bnsong MINGW64 /d/Git/phpbbcms-azure (master)$ git fetch upstreamremote: Counting objects: 1, done.remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 1Unpacking objects: 100% (1/1), done.From github.com:Source/phpbbcms-azure * [new branch]      DEV        -> upstream/DEV * [new branch]      master     -> upstream/masterv-gusong@ws-bapi-bnsong MINGW64 /d/Git/phpbbcms-azure (master)$ git branch -a  dev* master  remotes/origin/DEV  remotes/origin/HEAD -> origin/master  remotes/origin/dev  remotes/origin/master  remotes/upstream/DEV  remotes/upstream/masterv-gusong@ws-bapi-bnsong MINGW64 /d/Git/phpbbcms-azure (master)$ git merge remotes/upstream/masterUpdating 6d81e57..dfc3dd7Checking out files: 100% (2641/2641), done.Fast-forward

0 0