Git知识

1. 查看本地所有的分支

PS E:\Git\练习项目\vue_shop> git branch
  login
  master
  user

2. 查看本地是否有别名

PS E:\Git\练习项目\vue_shop> git remote -v
gitee   git@gitee.com:xin-code/vue_shop.git (fetch)
gitee   git@gitee.com:xin-code/vue_shop.git (push)
github  git@github.com:xin-code/Vue_shop.git (fetch)
github  git@github.com:xin-code/Vue_shop.git (push)

3. 用git fetch 是将远程主机的最新内容拉到本地，用户在检查了以后决定是否合并到工作本机分支中。
   git pull则是将远程主机的最新内容拉下来后直接合并，即：git pull = git fetch + git merge，这样可能会产生冲突，需要手动解决。
   git fetch gitee master:temp 这句命令的意思是：从远程的gitee仓库的master分支下载到本地并新建一个分支temp

PS E:\Git\练习项目\vue_shop> git fetch gitee master:temp
From gitee.com:xin-code/vue_shop
 * [new branch]      master     -> temp

4. 比较本地的仓库和远程参考的区别
   命令的意思是：比较master分支和temp分支的不同

PS E:\Git\练习项目\vue_shop> git diff temp
diff --git a/debug.log b/debug.log
deleted file mode 100644
index e7fb16a..0000000
--- a/debug.log
+++ /dev/null
@@ -1,7 +0,0 @@
-[1023/175659.103:ERROR:directory_reader_win.cc(43)] FindFirstFile: ϵͳ<D5>Ҳ<BB><B5><BD>ָ<B6><A8><B5><C4>·<BE><B6><A1><A3> (0x3)
-[1024/092423.368:ERROR:directory_reader_win.cc(43)] FindFirstFile: ϵͳ<D5>Ҳ<BB><B5><BD>ָ<B6><A8><B5><C4>·<BE><B6><A1><A3> (0x3)
-[1026/151453.014:ERROR:directory_reader_win.cc(43)] FindFirstFile: ϵͳ<D5>Ҳ<BB><B5><BD>ָ<B6><A8><B5><C4>·<BE><B6><A1><A3> (0x3)
-[1029/093027.593:ERROR:directory_reader_win.cc(43)] FindFirstFile: ϵͳ<D5>Ҳ<BB><B5><BD>ָ<B6><A8><B5><C4>·<BE><B6><A1><A3> (0x3)
-[1030/094456.219:ERROR:directory_reader_win.cc(43)] FindFirstFile: ϵͳ<D5>Ҳ<BB><B5><BD>ָ<B6><A8><B5><C4>·<BE><B6><A1><A3> (0x3)
-[1030/164815.950:ERROR:directory_reader_win.cc(43)] FindFirstFile: ϵͳ<D5>Ҳ<BB><B5><BD>ָ<B6><A8><B5><C4>·<BE><B6><A1><A3> (0x3)
-[1031/101941.692:ERROR:directory_reader_win.cc(43)] FindFirstFile: ϵͳ<D5>Ҳ<BB><B5><BD>ָ<B6><A8><B5><C4>·<BE><B6><A1><A3> (0x3)
diff --git a/package-lock.json b/package-lock.json
index f7f9646..6e4ce13 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1734,16 +1734,6 @@
           "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
           "dev": true
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
:

5. 合并temp分支到master分支

PS E:\Git\练习项目\vue_shop> git checkout master
Switched to branch 'master'
PS E:\Git\练习项目\vue_shop> git merge temp
Updating 0a99003..1dd0f07
 debug.log                           |   7 +
 package.json                        |   3 +-
 src/assets/global.css               |  15 ++
 src/components/goods/addgoods.vue   | 160 ++++++++++++
 src/components/goods/categories.vue | 344 ++++++++++++++++++++++++++
 src/components/index.vue            |   1 +
 src/components/power/rights.vue     |  74 ++++++
 src/components/users/users.vue      |  75 +++++-
 src/main.js                         |  17 ++
 src/router/index.js                 |  15 +-
 vue_api_server/cheese.log           | 454 ++++++----------------------------
 16 files changed, 1944 insertions(+), 462 deletions(-)
 create mode 100644 debug.log
 create mode 100644 src/components/goods/addgoods.vue
 create mode 100644 src/components/goods/categories.vue
 create mode 100644 src/components/goods/goods.vue
 create mode 100644 src/components/goods/params.vue
 create mode 100644 src/components/power/rights.vue
 create mode 100644 src/components/power/roles.vue

6. 删除分支

PS E:\Git\练习项目\vue_shop> git branch -d temp
Deleted branch temp (was 1dd0f07).

删除远程仓库分支

git push 仓库别名 --delete [branch_name]