git笔记

 

 1 G:\USST\vueProject\vue_shop>git branch
 2   login
 3   master
 4 * rights
 5   user
 6 
 7 G:\USST\vueProject\vue_shop>git add .
 8 
 9 G:\USST\vueProject\vue_shop>git commit -m "完成了权限功能的开发"
10 [rights 8ccf861] 完成了权限功能的开发
11  6 files changed, 510 insertions(+), 9 deletions(-)
12  create mode 100644 src/components/power/Rights.vue
13  create mode 100644 src/components/power/Roles.vue
14 
15 G:\USST\vueProject\vue_shop>git push
16 Counting objects: 16, done.
17 Delta compression using up to 4 threads.
18 Compressing objects: 100% (12/12), done.
19 Writing objects: 100% (16/16), 5.97 KiB | 0 bytes/s, done.
20 Total 16 (delta 7), reused 0 (delta 0)
21 remote: Powered by GITEE.COM [GNK-5.0]
22 To https://gitee.com/hurubo/vue_shop.git
23    be3cc95..8ccf861  rights -> rights
24 
25 G:\USST\vueProject\vue_shop>git checkout master
26 Switched to branch 'master'
27 Your branch is up-to-date with 'origin/master'.
28 
29 G:\USST\vueProject\vue_shop>git merge rights
30 Updating be3cc95..8ccf861
31 Fast-forward
32  src/assets/css/global.css       |   4 +-
33  src/components/power/Rights.vue |  60 +++++++
34  src/components/power/Roles.vue  | 353 ++++++++++++++++++++++++++++++++++++++++
35  src/components/user/Users.vue   |  85 +++++++++-
36  src/plugins/element.js          |  11 +-
37  src/router/index.js             |   6 +-
38  6 files changed, 510 insertions(+), 9 deletions(-)
39  create mode 100644 src/components/power/Rights.vue
40  create mode 100644 src/components/power/Roles.vue
41 
42 G:\USST\vueProject\vue_shop>git branch
43   login
44 * master
45   rights
46   user
47 
48 G:\USST\vueProject\vue_shop>git push
49 Total 0 (delta 0), reused 0 (delta 0)
50 remote: Powered by GITEE.COM [GNK-5.0]
51 To https://gitee.com/hurubo/vue_shop.git
52    be3cc95..8ccf861  master -> master
53 
54 G:\USST\vueProject\vue_shop>

 

posted @ 2021-02-05 15:04  水墨无痕258  阅读(70)  评论(0)    收藏  举报