git更新远程代码到本地仓库的命令
2024-04-28 02:26:48
方式一 （远程代码下载到本地新建分支；对比区别后在合并）
- 查看远程分支
git remote -v
$ git remote -v
origin https://github.com/shangsheng/uni-myMusic.git (fetch)
origin https://github.com/shangsheng/uni-myMusic.git (push)从上面的结果可以看出，远程仓库有一个是origin
2.从远程获取最新版本到本地
git fetch origin dev:temp
$ git fetch origin dev:temp
remote: Enumerating objects: 24, done.
remote: Counting objects: 100% (24/24), done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 13 (delta 6), reused 13 (delta 6), pack-reused 0
Unpacking objects: 100% (13/13), done.
From https://github.com/shangsheng/uni-myMusic* [new branch] dev -> temp155cc23..c54244c dev -> origin/devgit fetch origin dev:temp 这句命令的意思是：从远程的origin仓库的dev分支下载到本地并新建一个分支temp
- 比较本地的仓库和远程参考的区别
git diff temp
$ git diff temp
diff --git a/common/iocnfont.css b/common/iocnfont.css
index de63817..781586e 100644
--- a/common/iocnfont.css
+++ b/common/iocnfont.css
@@ -1,10 +1,10 @@@font-face {font-family: "iconfont";
- src: url('//at.alicdn.com/t/font_2286010_se5nlzaqkm8.eot?t=1611197261002'); /* IE9 */
- src: url('//at.alicdn.com/t/font_2286010_se5nlzaqkm8.eot?t=1611197261002#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAA8cAAsAAAAAG2wAAA7NAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCGXgqjLJxKATYCJANsCzgABCAFhG0HgncbCRcz0nLSihnZ/wEygVs9QFJX4x7bYoRXUcRqGFDgkbXnjsGBBE2TQOIDWgAAngJAAwCggS9ABU7gOD/4uuO1HaFlwDEHjHgRwFBK+Odbe71vZnY/ECQlRFWF4Cocga5iRbYnqq5CAcqEXYkWGXJtlxQTwhgDbuRFoWUi3N23X4qBZBRYW6INT9vq38zQQw1lYeGJEUVbGPhhsHCLMDYbvPSDVbDV3J2b5Ua0uO5F661XRQNSGyuct+01aZ3fTpGJyEn0qAJUXGbkmlyFXzX+TCQJe4Xv59ZdLRZBuuYZYhXu3Qk2+W6XU81euKcumDlYF580p8iv4ZMlnyxl8TJchMq7ActP+9WqW7p2BwzeLkQ8tpk/ZyMnb30W078+iFiCeolMpNv67Om/Q1RChEqnVXKkd2xb5Wj7XPAug+zxN+WSmoQaohk8TBPY39ZbQ0CUpqm0dv0pGxSH4MJup09UFIEG3LiEZhEe8CVjOnQbj7C5Ym4Tblm/XmM0FDB4FmHcefRwKdgg+C8r4EB5uVyeAnZjgQWmAgemKN2oNNZhUy0Rle3r6CdM1GZfIzyINB/+goWKk09jtg/ZbTXit6GS2bfrfwYBg0jJ8yMtVsWpCyUmmnMmm2n2ouanhKKKODlV/bDLEvg7k6EgQhIRIy9D/+cRoiSFwyML+fBd4wDaiEgVgzwXoojB1EJUMJheiDgM5hcih8ECzSeL4NBkCYCFrAAoQ1YBJCBbAHzIDoAo5DQABnI5OHXIHQAikDsBJCF3ARDkQQAxyIsA8pBXAWQg7wIIQz4DEIL8joUoYegQkLLkVQAO8hEUHmusCweQBVDDGPPBTuIdJ6HDiLpX7Cg8whhT+Cvfeiof8xZWgsHCF8u0+DZh6gnVkmr4qGyjmtbfJsUZyUZCmKjM5iUQkEhnlyLAdyieymnj8aUNsqgsEAgRgvHu1Cpy6fRGk89gp命令的意思是：比较dev分支和temp分支的不同
- 合并temp分支到dev分支
git merge temp
$ git merge temp
Updating 155cc23..c54244c
Fast-forwardcommon/iocnfont.css | 24 +++-common/uni-change.css | 4 +pages/secondaryPage/playlist/playlist.vue | 6 +-pages/secondaryPage/songDetails/songDetails.vue | 34 +++++-pages/template/playing_list.vue | 147 ++++++++++++++++++++++++5 files changed, 205 insertions(+), 10 deletions(-)create mode 100644 pages/template/playing_list.vue- 如果不想要temp分支了，可以删除此分支
$ git branch -d temp
Deleted branch temp (was c54244c).方式二 （远程代码直接下载合并到本地）
- 查看远程分支，和上面的第一步相同
git remote -v - 从远程获取最新版本到本地
git fetch origin master
$ git fetch origin master
From https://github.com/shangsheng/uni-myMusic* branch master -> FETCH_HEAD2ec5295..98d9ace master -> origin/master- 比较本地的仓库和远程参考的区别
git log -p master… origin/master
$ git log -p master.. origin/master
commit 98d9ace3c0ccdfaf4872a851c09f361e064bbe30 (origin/master)
Date: Thu Dec 24 15:53:08 2020 +0800首页模块音乐日历以及专属场景歌单diff --git a/common/iocnfont.css b/common/iocnfont.css
index 0624283..17cc7d4 100644
--- a/common/iocnfont.css
+++ b/common/iocnfont.css
@@ -1,10 +1,10 @@@font-face {font-family: "iconfont";
- src: url('//at.alicdn.com/t/font_2286010_r4ie67ce7p.eot?t=1608710949770'); /* IE9 */
- src: url('//at.alicdn.com/t/font_2286010_r4ie67ce7p.eot?t=1608710949770#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAM8AAsAAAAAB0gAAALtAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDHAqCBIFqATYCJAMQCwoABCAFhG0HRRtZBsgehXFj3axcSpSF7eMKnj458s/unIUKjokqL2V6VVIJlekOl2v5AGB35iWwekVFtoebHOcAjS/YugrbGtfgPric/ijLHqR1luU21qK9KBoTMLA0sLEmbeECyb1h7CYCh7AZArgSSTpSf3bzkiqhgF4CyAKVCqlSzoGiVtgZwbFmoiJHcMDZ7DUvgcP8+/KHXHEGg4MFDOyedSqndt+b30PslsktDFEE3nxmwJoGFkgHFGRObWAaWcQiLK7NcxQCzjhjYK66gO8hk5NSDzvmQBuY0X+eOAJS3QHIV4MWvnthFgx8D5BQJwtR+S+QoQA480ZJjaToBVDCOcYgGG/vTjs7v7LvTrCevevmtv++OGy955En0C3vC3M4d2/9jN93mffE4fLrov0pM//epp+ZfiLwlIx+BZ0OWPpxxn/J+4nRIboZa+rsMdfMHt+m7h6/a1j+nMv96hag2Gf8X1R43zzmErWkc- 把远程下载下来的代码合并到本地仓库，远程的和本地的合并
git merge origin/master
$ git merge origin/master
Updating 2ec5295..98d9ace
Fast-forwardApp.vue | 1 +common/api.js | 1039 ++common/iocnfont.css | 36 +common/plugInUnit.js | 92 +common/uni-change.css | 32 +common/util.js | 32 +-components/vear-carousel/vear-carousel.vue | 124 +js_sdk/luch-request/luch-request/adapters/index.js | 88 +.../luch-request/core/InterceptorManager.js | 51 +js_sdk/luch-request/luch-request/core/Request.js | 199 +.../luch-request/core/buildFullPath.js | 20 +js_sdk/luch-request/luch-request/core/defaults.js | 30 +.../luch-request/core/dispatchRequest.js | 6 +.../luch-request/luch-request/core/mergeConfig.js | 89 +js_sdk/luch-request/luch-request/core/settle.js | 16 +.../luch-request/luch-request/helpers/buildURL.js | 69 +.../luch-request/helpers/combineURLs.js | 14 +.../luch-request/helpers/isAbsoluteURL.js | 14 +js_sdk/luch-request/luch-request/index.js | 2 +js_sdk/luch-request/luch-request/utils.js | 131 +main.js | 6 +manifest.json | 31 +-pages/tabBar/home/home.vue | 195 +-pages/template/drawerMenu.vue | 5 +-pages/template/homeBlock.vue | 393 +.../dev/.sourcemap/mp-weixin/common/main.js.map | 2 +-.../dev/.sourcemap/mp-weixin/common/runtime.js.map | 2 +-.../dev/.sourcemap/mp-weixin/common/vendor.js.map | 2 +-.../components/uni-drawer/uni-drawer.js.map | 2 +-.../components/uni-icons/uni-icons.js.map | 2 +-.../uni-search-bar/uni-search-bar.js.map | 2 +-.../uni-swiper-dot/uni-swiper-dot.js.map | 2 +-.../mp-weixin/components/uni-tag/uni-tag.js.map | 2 +-.../mp-weixin/pages/tabBar/home/home.js.map | 2 +-.../mp-weixin/pages/template/drawerMenu.js.map | 2 +-.../mp-weixin/pages/template/homeBlock.js.map | 1 +unpackage/dist/dev/mp-weixin/app.json | 2 +-unpackage/dist/dev/mp-weixin/common/main.js | 8 +-unpackage/dist/dev/mp-weixin/common/main.wxss | 94 +unpackage/dist/dev/mp-weixin/common/runtime.js | 4 +-unpackage/dist/dev/mp-weixin/common/vendor.js | 16461 +++++++++++--------.../mp-weixin/components/uni-drawer/uni-drawer.js | 28 +-.../mp-weixin/components/uni-icons/uni-icons.js | 30 +-.../components/uni-search-bar/uni-search-bar.js | 32 +-.../components/uni-swiper-dot/uni-swiper-dot.js | 267 +.../components/uni-swiper-dot/uni-swiper-dot.json | 4 +.../components/uni-swiper-dot/uni-swiper-dot.wxml | 1 +.../components/uni-swiper-dot/uni-swiper-dot.wxss | 112 +.../dev/mp-weixin/components/uni-tag/uni-tag.js | 240 +.../dev/mp-weixin/components/uni-tag/uni-tag.json | 4 +.../dev/mp-weixin/components/uni-tag/uni-tag.wxml | 1 +.../dev/mp-weixin/components/uni-tag/uni-tag.wxss | 131 +.../dist/dev/mp-weixin/pages/tabBar/Blog/blog.js | 24 +-.../dev/mp-weixin/pages/tabBar/Karaoke/Karaoke.js | 24 +-.../dist/dev/mp-weixin/pages/tabBar/home/home.js | 234 +-.../dist/dev/mp-weixin/pages/tabBar/home/home.json | 4 +-.../dist/dev/mp-weixin/pages/tabBar/home/home.wxml | 2 +-.../dist/dev/mp-weixin/pages/tabBar/home/home.wxss | 80 +-unpackage/dist/dev/mp-weixin/pages/tabBar/my/my.js | 24 +-.../dev/mp-weixin/pages/tabBar/yuncun/yuncun.js | 24 +-.../dev/mp-weixin/pages/template/drawerMenu.js | 57 +-.../dev/mp-weixin/pages/template/drawerMenu.wxss | 30 +.../dist/dev/mp-weixin/pages/template/homeBlock.js | 455 +.../dev/mp-weixin/pages/template/homeBlock.json | 6 +.../dev/mp-weixin/pages/template/homeBlock.wxml | 1 +.../dev/mp-weixin/pages/template/homeBlock.wxss | 300 +unpackage/dist/dev/mp-weixin/sitemap56.json | 7 +unpackage/dist/dev/mp-weixin/sitemap80.json | 7 +unpackage/dist/dev/mp-weixin/sitemap91.json | 7 +69 files changed, 14082 insertions(+), 7359 deletions(-)create mode 100644 common/api.jscreate mode 100644 common/iocnfont.csscreate mode 100644 common/plugInUnit.jscreate mode 100644 components/vear-carousel/vear-carousel.vuecreate mode 100644 js_sdk/luch-request/luch-request/adapters/index.jscreate mode 100644 js_sdk/luch-request/luch-request/core/InterceptorManager.jscreate mode 100644 js_sdk/luch-request/luch-request/core/Request.jscreate mode 100644 js_sdk/luch-request/luch-request/core/buildFullPath.jscreate mode 100644 js_sdk/luch-request/luch-request/core/defaults.jscreate mode 100644 js_sdk/luch-request/luch-request/core/dispatchRequest.jscreate mode 100644 js_sdk/luch-request/luch-request/core/mergeConfig.jscreate mode 100644 js_sdk/luch-request/luch-request/core/settle.jscreate mode 100644 js_sdk/luch-request/luch-request/helpers/buildURL.jscreate mode 100644 js_sdk/luch-request/luch-request/helpers/combineURLs.jscreate mode 100644 js_sdk/luch-request/luch-request/helpers/isAbsoluteURL.jscreate mode 100644 js_sdk/luch-request/luch-request/index.jscreate mode 100644 js_sdk/luch-request/luch-request/utils.jscreate mode 100644 pages/template/homeBlock.vuecreate mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/template/homeBlock.js.mapcreate mode 100644 unpackage/dist/dev/mp-weixin/components/uni-swiper-dot/uni-swiper-dot.jscreate mode 100644 unpackage/dist/dev/mp-weixin/components/uni-swiper-dot/uni-swiper-dot.jsoncreate mode 100644 unpackage/dist/dev/mp-weixin/components/uni-swiper-dot/uni-swiper-dot.wxmlcreate mode 100644 unpackage/dist/dev/mp-weixin/components/uni-swiper-dot/uni-swiper-dot.wxsscreate mode 100644 unpackage/dist/dev/mp-weixin/components/uni-tag/uni-tag.jscreate mode 100644 unpackage/dist/dev/mp-weixin/components/uni-tag/uni-tag.jsoncreate mode 100644 unpackage/dist/dev/mp-weixin/components/uni-tag/uni-tag.wxmlcreate mode 100644 unpackage/dist/dev/mp-weixin/components/uni-tag/uni-tag.wxsscreate mode 100644 unpackage/dist/dev/mp-weixin/pages/template/drawerMenu.wxsscreate mode 100644 unpackage/dist/dev/mp-weixin/pages/template/homeBlock.jscreate mode 100644 unpackage/dist/dev/mp-weixin/pages/template/homeBlock.jsoncreate mode 100644 unpackage/dist/dev/mp-weixin/pages/template/homeBlock.wxmlcreate mode 100644 unpackage/dist/dev/mp-weixin/pages/template/homeBlock.wxsscreate mode 100644 unpackage/dist/dev/mp-weixin/sitemap56.jsoncreate mode 100644 unpackage/dist/dev/mp-weixin/sitemap80.jsoncreate mode 100644 unpackage/dist/dev/mp-weixin/sitemap91.json总结：方式一更好理解，更安全，对于pull也可以更新代码到本地，相当于fetch+merge，多人写作的话不够安全。
git更新远程代码到本地仓库的命令相关推荐
- git 更新远程代码到本地仓库
git fetch 的简单用法:更新远程代码到本地仓库 方式一 (远程代码直接下载合并到本地) 1. 查看远程仓库 $ git remote -v eoecn https://github.com/e ...
- git之branch分支增删改查、切换、更新远程代码到本地仓库
目录 0.环境 1.branch创建并推送到远程 2.branch删除 3.branch重命名 4.branch查询 5.branch切换 6.更新远程branch到本地仓库 参考 0.环境 wind ...
- fetch整个仓库 github_git fetch 的简单用法:更新远程代码到本地仓库
方式一 1. 查看远程仓库 1 2 3 4 5 6 $ git remote -v eoecn https://github.com/eoecn/android-app.git (fetch) eoe ...
- feach同步 git_git fetch 更新远程代码到本地仓库
理解 fetch 的关键, 是理解 FETCH_HEAD,FETCH_HEAD指的是: 某个branch在服务器上的最新状态'.这个列表保存在 .Git/FETCH_HEAD 文件中, 其中每一行对应 ...
- gitee 从 拉取新分支到本地_git fetch 的简单用法:更新远程代码到本地仓库
Git中从远程的分支获取最新的版本到本地方式如下, 如何更新下载到代码到本地,请参阅ice的博客基于Github参与eoe的开源项目指南 方式一 1. 查看远程仓库 1 2 3 4 5 6 $ git ...
- git更新远程分支到本地
场景:git远程新建分支,在本地开发工具中(如vscode)切换远程新建的分支时,提示不存在当前分支,如下图: 1.此时需要同步下远程的分支,采用如下命令: git branch -r | grep ...
- Git更新远程仓库代码到本地仓库办法
Git更新远程仓库代码到本地仓库办法 1. 需求 2. 查看远程分支 git remote -v 3. 从远程获取最新版本到本地 git fetch origin master:temp 4. 比较本 ...
- Git建立远程代码仓库和本地代码仓库
Git建立远程代码仓库和本地代码仓库 使用Git管理代码,需要有两个仓库.一个是远程代码仓库,一个是本地代码仓库. 远程仓库是用来托管代码的平台,比如说Github,GitLab,Gerrit,码云G ...
- 【git】阿里云上传代码到github附SSH-KEY免密码上传更新github代码到本地
远程连接阿里云服务器,确保安全组内ssh端口打开(如果更改ssh连接端口的话),按照下面代码依次敲 root用户下登录 [root@iz2ze8w7169ei61c5c1il5z /]cd ~ [ro ...
最新文章
- 基类的析构函数不能被继承。_为什么要把C++类中的析构函数声明为虚函数？
- 干货 | 机器学习正在面临哪些主要挑战？
- 【机器学习】线性回归之Normal Equation（矩阵求导与线性代数视角）
- Linux下部署Kubernetes+Kubesphere（一）Kubernetes基础
- 记腾讯互娱网站布局（3）
- 多播泡妞宝典---IGMP
- 基于Office 365 无代码工作流分析-需求基本分析！
- cookie 设置有效期 检测cookie
- 201521123115 《Java程序设计》第3周学习总结
- python最小值最大化和最大值最小化_OJ 21658::Monthly Expense(二分搜索+最小化最大值）...
- android工程角度相机,anglecam角度相机软件下载
- 计算机折线图教程,excel折线图如何添加数字标签？ excel折线图添加数字标签的方法...
- 【iOS开发】—— 调用相机、相册
- 何谓服务器(Server) ?
- android会员充值功能,微信会员卡充值功能怎么开通？
- 游园惊梦--记游第九届软博会
- HTML5期末考核大作业网站——卫生与健康HTML+CSS+JavaScript
- ChatGPT 免费体验来了
- Go webrtc项目pion创始人专访 | Gopher Daily (2021.04.07) ʕ◔ϖ◔ʔ
- Saas发展史常用架构