码云-git--更新。。。-优快云博客

本文链接：https://blog.youkuaiyun.com/zzxhahaha/article/details/110734306

学习目标：

git的基本命令

学习内容：

提示：这里可以添加要学的内容
例如：
1、 git创建
2、建立本地仓库，和远程仓库
3、基本命令git命令

学习时间：

1、周一至周五晚上、9 点—晚上10点 2、周六上午 93点-上午 15 点 3、周日下午 3 点-下午 6 点

学习产出：

提示：这里统计学习计划的总量
1：查看状态


git status
//检查状态-查看本地仓库是否干净
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean

2：创建分支

git checkout -b login
//创建子分支login
Switched to a new branch 'login'

3：查看所有分支

 git branch
* login
//*表示正处于*分支。处于login分支
  master

4：同步码云

PS D:\毕业设计\乡村物流管理系统\myweb_5135> git status
On branch login
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)        
  (use "git restore <file>..." to discard changes in working directory)
        modified:   package.json
        modified:   src/App.vue
        deleted:    src/components/HelloWorld.vue
        modified:   src/main.js
        modified:   src/plugins/element.js
        modified:   src/router/index.js
        deleted:    src/views/About.vue
        deleted:    src/views/Home.vue
        modified:   yarn.lock

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        .prettierrc
        src/assets/css/
        src/assets/fonts/
        src/assets/images/
        src/components/Home.vue
        src/components/Login.vue

no changes added to commit (use "git add" and/or "git commit -a")
PS D:\毕业设计\乡村物流管理系统\myweb_5135>

5：添加到缓存区


PS D:\毕业设计\乡村物流管理系统\myweb_5135> git add .
warning: LF will be replaced by CRLF in package.json.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in src/App.vue.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in src/plugins/element.js.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in src/router/index.js.
The file will have its original line endings in your working directory

在这里插入图片描述
6:t本地提交

git commit -m "login完成"
[login cd0c0c6] login完成
 25 files changed, 1186 insertions(+), 153 deletions(-)
 create mode 100644 .prettierrc
 rewrite src/App.vue (84%)
 create mode 100644 src/assets/css/global.css
 create mode 100644 src/assets/fonts/demo.css
 create mode 100644 src/assets/fonts/demo_fontclass.html
 create mode 100644 src/assets/fonts/demo_symbol.html
 create mode 100644 src/assets/fonts/demo_unicode.html
 create mode 100644 src/assets/fonts/iconfont.css
 create mode 100644 src/assets/fonts/iconfont.eot
 create mode 100644 src/assets/fonts/iconfont.js
 create mode 100644 src/assets/fonts/iconfont.svg
 create mode 100644 src/assets/fonts/iconfont.ttf
 create mode 100644 src/assets/fonts/iconfont.woff
 create mode 100644 src/assets/images/2019081.jpg
 create mode 100644 src/assets/images/2023151.jpg
 delete mode 100644 src/components/HelloWorld.vue
 create mode 100644 src/components/Home.vue
 create mode 100644 src/components/Login.vue
 rewrite src/router/index.js (79%)
 delete mode 100644 src/views/About.vue
 delete mode 100644 src/views/Home.vue
PS D:\毕业设计\乡村物流管理系统\myweb_5135>

6；login 代码合并到主分支
1：先切换到主分支’然后主动合并

git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  login
* master
PS`D:\毕业设计\乡村物流管理系统\myweb_5135>

2合并分支

git merge login
Updating 6c878d6..cd0c0c6
Fast-forward
 .prettierrc                          |   4 +
 package.json                         |   2 +
 src/App.vue                          |  29 +--
 src/assets/css/global.css            |   6 +
 src/assets/fonts/demo.css            | 370 +++++++++++++++++++++++++++++++++++
 src/assets/fonts/demo_fontclass.html | 100 ++++++++++
 src/assets/fonts/demo_symbol.html    | 143 ++++++++++++++
 src/assets/fonts/demo_unicode.html   | 138 +++++++++++++
 src/assets/fonts/iconfont.css        |  37 ++++
 src/assets/fonts/iconfont.eot        | Bin 0 -> 3656 bytes
 src/assets/fonts/iconfont.js         |   1 +
 src/assets/fonts/iconfont.svg        |  63 ++++++
 src/assets/fonts/iconfont.ttf        | Bin 0 -> 3488 bytes
 src/assets/fonts/iconfont.woff       | Bin 0 -> 2384 bytes
 src/assets/images/2019081.jpg        | Bin 0 -> 1137649 bytes
 src/assets/images/2023151.jpg        | Bin 0 -> 1047859 bytes
 src/components/HelloWorld.vue        |  58 ------
 src/components/Home.vue              |  21 ++
 src/components/Login.vue             | 162 +++++++++++++++
 src/main.js                          |  19 +-
 src/plugins/element.js               |   8 +-
 src/router/index.js                  |  51 +++--
 src/views/About.vue                  |   5 -
 src/views/Home.vue                   |  18 --
 yarn.lock                            |  58 +++++-
 25 files changed, 1163 insertions(+), 130 deletions(-)
 create mode 100644 .prettierrc
 create mode 100644 src/assets/css/global.css
 create mode 100644 src/assets/fonts/demo.css
 create mode 100644 src/assets/fonts/demo_fontclass.html
 create mode 100644 src/assets/fonts/demo_symbol.html
 create mode 100644 src/assets/fonts/demo_unicode.html
 create mode 100644 src/assets/fonts/iconfont.css
 create mode 100644 src/assets/fonts/iconfont.eot
 create mode 100644 src/assets/fonts/iconfont.js
 create mode 100644 src/assets/fonts/iconfont.svg
 create mode 100644 src/assets/fonts/iconfont.ttf
 create mode 100644 src/assets/fonts/iconfont.woff
 create mode 100644 src/assets/images/2019081.jpg
 create mode 100644 src/assets/images/2023151.jpg
 delete mode 100644 src/components/HelloWorld.vue
 create mode 100644 src/components/Home.vue
 create mode 100644 src/components/Login.vue
 delete mode 100644 src/views/About.vue
 delete mode 100644 src/views/Home.vue
PS D:\毕业设计\乡村物流管理系统\myweb_5135>

7:远程推送


git push //远程推送
Enumerating objects: 44, done.
Counting objects: 100% (44/44), done.
Delta compression using up to 8 threads
Compressing objects: 100% (28/28), done.
Writing objects: 100% (32/32), 2.06 MiB | 1.35 MiB/s, done.
Total 32 (delta 3), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-5.0]
To https://gitee.com/Iridescentcloud/myweb_5135.git
   6c878d6..cd0c0c6  master -> master
PS D:\毕业设计\乡村物流管理系统\myweb_5135>

8：云端还没有login分支

PS D:\毕业设计\乡村物流管理系统\myweb_5135> git checkout login //切换到子分支
Switched to branch 'login'
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
* login
  master

//第一次提交 需要-u origin 分支名字并且提交
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git push -u origin login
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-5.0]
remote: Create a pull request for 'login' on Gitee by visiting:
remote:     https://gitee.com/Iridescentcloud/myweb_5135/pull/new/Iridescentcloud:login...Iridescentcloud:master
To https://gitee.com/Iridescentcloud/myweb_5135.git
 * [new branch]      login -> login
Branch 'login' set up to track remote branch 'login' from 'origin'.
PS D:\毕业设计\乡村物流管理系统\myweb_5135>

9：完成了login分支，user 分支推送到云端

//查看分支
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
* login
  master
  //创建分支use且切换到 user'
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git checkout -b user
Switched to a new branch 'user'
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  login
  master
* user
* //查看状态，还有很多新的内容
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git status
  (use "git add/rm <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   src/assets/css/global.css
        deleted:    src/assets/logo.png
        modified:   src/components/Home.vue
        modified:   src/components/Login.vue
        modified:   src/main.js
        modified:   src/plugins/element.js
        modified:   src/router/index.js

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        src/assets/images/2018603.jpg
        src/assets/images/zzxlogo.png
        src/components/Welcome.vue

no changes added to commit (use "git add" and/or "git commit -a")
//添加到缓存区
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git add .
//状态栏很干净
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git status
On branch user
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   src/assets/css/global.css
        new file:   src/assets/images/zzxlogo.png
        deleted:    src/assets/logo.png
        modified:   src/components/Login.vue
        new file:   src/components/Welcome.vue
        new file:   src/components/user/users.vue
        modified:   src/plugins/element.js
        modified:   src/router/index.js
//提交到本地创库user分支， 提示消息
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git commit -m '完成用户列表'
[user 5f0f15c] 完成用户列表
 11 files changed, 751 insertions(+), 63 deletions(-)
 create mode 100644 src/assets/images/2018603.jpg
 create mode 100644 src/assets/images/zzxlogo.png
 delete mode 100644 src/assets/logo.png
 create mode 100644 src/components/Welcome.vue
 create mode 100644 src/components/user/users.vue
 rewrite src/plugins/element.js (64%)
On branch user
nothing to commit, working tree clean
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  master
* user
* ///git push -u origin user 
* //码云zhong创建一个user 分支 ，然后上传
Enumerating objects: 34, done.
Counting objects: 100% (34/34), done.
Delta compression using up to 8 threads
Writing objects: 100% (20/20), 1.48 MiB | 940.00 KiB/s, done.
Total 20 (delta 4), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-5.0]
remote: Create a pull request for 'user' on Gitee by visiting:
remote:     https://gitee.com/Iridescentcloud/myweb_5135/pull/new/Iridescentcloud:user...Iridescentcloud:master
To https://gitee.com/Iridescentcloud/myweb_5135.git
 * [new branch]      user -> user
Branch 'user' set up to track remote branch 'user' from 'origin'.
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  login
  master
* user
//切换到master分支
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  login
* master
  user
//git merge user 合并分支
Updating cd0c0c6..5f0f15c
Fast-forward
 src/assets/css/global.css     |  19 +-
 src/assets/images/2018603.jpg | Bin 0 -> 1518013 bytes
 src/assets/images/zzxlogo.png | Bin 0 -> 31601 bytes
 src/assets/logo.png           | Bin 6849 -> 0 bytes
 src/components/Home.vue       | 177 ++++++++++++++++-
 src/components/Login.vue      |  91 ++++-----
 src/components/Welcome.vue    |  20 ++
 src/components/user/users.vue | 436 ++++++++++++++++++++++++++++++++++++++++++
 src/main.js                   |   9 +
 src/plugins/element.js        |  31 ++-
 src/router/index.js           |  19 +-
 11 files changed, 745 insertions(+), 57 deletions(-)
 create mode 100644 src/assets/images/2018603.jpg
 create mode 100644 src/assets/images/zzxlogo.png
 delete mode 100644 src/assets/logo.png
 create mode 100644 src/components/Welcome.vue
 create mode 100644 src/components/user/users.vue
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git push  提交到码云中
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-5.0]
To https://gitee.com/Iridescentcloud/myweb_5135.git
   cd0c0c6..5f0f15c  master -> master
PS D:\毕业设计\乡村物流管理系统\myweb_5135>

9：创建新分支–right (权限) 推送到云端

PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  login
* master
  user
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git checkout -b rights
Switched to a new branch 'rights'
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  login
  master
* rights
  user
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git push -u origin rights
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-5.0]
remote: Create a pull request for 'rights' on Gitee by visiting:
remote:     https://gitee.com/Iridescentcloud/myweb_5135/pull/new/Iridescentcloud:rights...Iridescentcloud:master
To https://gitee.com/Iridescentcloud/myweb_5135.git
 * [new branch]      rights -> rights
Branch 'rights' set up to track remote branch 'rights' from 'origin'.
PS D:\毕业设计\乡村物流管理系统\myweb_5135>

10：提交本地分支并且推送到码云


PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  login
* rights
  user
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git add .
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git commit -m 'righs功能  完成了开发'
[rights aec5999] righs功能  完成了开发
 6 files changed, 681 insertions(+), 8 deletions(-)
 create mode 100644 src/components/power/Rights.vue
 create mode 100644 src/components/power/role.vue
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git push
Enumerating objects: 28, done.
Counting objects: 100% (28/28), done.
Delta compression using up to 8 threads
Compressing objects: 100% (12/12), done.
Writing objects: 100% (16/16), 5.74 KiB | 735.00 KiB/s, done.
Total 16 (delta 7), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-5.0]
To https://gitee.com/Iridescentcloud/myweb_5135.git
   5f0f15c..aec5999  rights -> rights
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  login
* master
  rights
  user
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git merge rights
Updating 5f0f15c..aec5999
Fast-forward
 src/assets/css/global.css       |   2 +
 src/components/power/Rights.vue |  72 ++++++
 src/components/power/role.vue   | 509 ++++++++++++++++++++++++++++++++++++++++
 src/components/user/users.vue   |  88 ++++++-
 src/plugins/element.js          |   7 +-
 src/router/index.js             |  11 +-
 6 files changed, 681 insertions(+), 8 deletions(-)
 create mode 100644 src/components/power/Rights.vue
 create mode 100644 src/components/power/role.vue
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  login
* master
  rights
  user
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git push
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-5.0]
To https://gitee.com/Iridescentcloud/myweb_5135.git
   5f0f15c..aec5999  master -> master
PS D:\毕业设计\乡村物流管理系统\myweb_5135>

11:完成商品分类



Windows PowerShell
版权所有 (C) Microsoft Corporation。保留所有权利。

尝试新的跨平台 PowerShell https://aka.ms/pscore6

PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
* goods_cata
  login
  master
  rights
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git status
On branch goods_cata
Your branch is up to date with 'origin/goods_cata'.

  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   package.json
        modified:   src/assets/css/global.css
        modified:   src/main.js
        modified:   src/plugins/element.js
        modified:   src/router/index.js
        modified:   yarn.lock

  (use "git add <file>..." to include in what will be committed)
        src/components/Goods/
        src/vue.config.js

no changes added to commit (use "git add" and/or "git commit -a")
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git add.
git: 'add.' is not a git command. See 'git --help'.

The most similar command is
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git add .
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git status
On branch goods_cata
Your branch is up to date with 'origin/goods_cata'.

  (use "git restore --staged <file>..." to unstage)
        modified:   package.json
        new file:   src/components/Goods/categories.vue
        modified:   src/components/power/role.vue
        modified:   src/main.js
        modified:   src/plugins/element.js
        modified:   src/router/index.js
        modified:   yarn.lock

PS D:\毕业设计\乡村物流管理系统\myweb_5135> git commit-m '完成了分类的开发'
git: 'commit-m' is not a git command. See 'git --help'.

The most similar command is
        commit-tree
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git commit -m '完成了分类的开发'
[goods_cata 5fa8839] 完成了分类的开发
 9 files changed, 500 insertions(+), 58 deletions(-)
 create mode 100644 src/components/Goods/categories.vue
 create mode 100644 src/vue.config.js
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git status
On branch goods_cata
  (use "git push" to publish your local commits)

nothing to commit, working tree clean
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git push
Enumerating objects: 34, done.
Counting objects: 100% (34/34), done.
Delta compression using up to 8 threads
Compressing objects: 100% (15/15), done.
Writing objects: 100% (19/19), 6.44 KiB | 439.00 KiB/s, done.
Total 19 (delta 9), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-5.0]
To https://gitee.com/Iridescentcloud/myweb_5135.git
   aec5999..5fa8839  goods_cata -> goods_cata
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
* goods_cata
  login
  master
  rights
  user
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git checkout master 
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  goods_cata
  login
* master
  rights
  user
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git merge goods_cata
Updating aec5999..5fa8839
Fast-forward
 package.json                        |   4 +-
 src/assets/css/global.css           |   4 +
 src/components/Goods/categories.vue | 356 ++++++++++++++++++++++++++++++++++++
 src/components/power/role.vue       | 110 +++++------
 src/main.js                         |   5 +
 src/plugins/element.js              |   3 +-
 src/router/index.js                 |   8 +-
 src/vue.config.js                   |   7 +
 yarn.lock                           |  61 +++++-
 9 files changed, 500 insertions(+), 58 deletions(-)
 create mode 100644 src/components/Goods/categories.vue
 create mode 100644 src/vue.config.js
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git push
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-5.0]
To https://gitee.com/Iridescentcloud/myweb_5135.git
   aec5999..5fa8839  master -> master
PS D:\毕业设计\乡村物流管理系统\myweb_5135>

12:创建goods_params分支


PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  goods_cata
  login
* master
  rights
  user
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git checkout -b goods_params
Switched to a new branch 'goods_params'
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  goods_cata
* goods_params
  login
  master
  rights
  user
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git push -u origin goods_params 
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-5.0]
remote: Create a pull request for 'goods_params' on Gitee by visiting:
remote:     https://gitee.com/Iridescentcloud/myweb_5135/pull/new/Iridescentcloud:goods_params...Iridescentcloud:master
To https://gitee.com/Iridescentcloud/myweb_5135.git
 * [new branch]      goods_params -> goods_params
Branch 'goods_params' set up to track remote branch 'goods_params' from 'origin'.
PS D:\毕业设计\乡村物流管理系统\myweb_5135>

13：完成商品


PS D:\毕业设计\乡村物流管理系统\myweb_5135> git status
On branch goods_list
Your branch is up to date with 'origin/goods_list'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   package.json
        modified:   src/plugins/element.js
        modified:   src/router/index.js
        modified:   yarn.lock

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        src/components/Goods/add.vue

no changes added to commit (use "git add" and/or "git commit -a")
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  goods_cata
* goods_list
  goods_params
  login
  master
  rights
  user
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git add .
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git commit -m '完成商品功能开发'
 7 files changed, 553 insertions(+), 3 deletions(-)
 create mode 100644 src/components/Goods/add.vue
 create mode 100644 src/components/Goods/goods_list.vue
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git status
On branch goods_list
Your branch is ahead of 'origin/goods_list' by 1 commit.
  (use "git push" to publish your local commits)

nothing to commit, working tree clean
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git push
Enumerating objects: 25, done.
Counting objects: 100% (25/25), done.
Delta compression using up to 8 threads
Compressing objects: 100% (12/12), done.
Writing objects: 100% (14/14), 7.34 KiB | 751.00 KiB/s, done.
Total 14 (delta 7), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-5.0]
To https://gitee.com/Iridescentcloud/myweb_5135.git
   fb770c8..b4fe7a2  goods_list -> goods_list
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  goods_cata
  goods_list
  goods_params
  login
* master
  rights
  user
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git merge goods_list  
Updating fb770c8..b4fe7a2
Fast-forward
 package.json                        |   2 +
 src/components/Goods/add.vue        | 304 ++++++++++++++++++++++++++++++++++++
 src/components/Goods/goods_list.vue | 155 ++++++++++++++++++
 src/main.js                         |  24 ++-
 src/plugins/element.js              |   8 +-
 src/router/index.js                 |  12 ++
 yarn.lock                           |  51 +++++-
 7 files changed, 553 insertions(+), 3 deletions(-)
 create mode 100644 src/components/Goods/add.vue
 create mode 100644 src/components/Goods/goods_list.vue
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git push
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-5.0]
To https://gitee.com/Iridescentcloud/myweb_5135.git
   fb770c8..b4fe7a2  master -> master
PS D:\毕业设计\乡村物流管理系统\myweb_5135>

14:创建order 分支


PS D:\毕业设计\乡村物流管理系统\myweb_5135> git status
On branch goods_list
Your branch is up to date with 'origin/goods_list'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   package.json
        modified:   src/plugins/element.js
        modified:   src/router/index.js
        modified:   yarn.lock

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        src/components/Goods/add.vue

no changes added to commit (use "git add" and/or "git commit -a")
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  goods_cata
* goods_list
  goods_params
  login
  master
  rights
  user
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git add .
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git commit -m '完成商品功能开发'
 7 files changed, 553 insertions(+), 3 deletions(-)
 create mode 100644 src/components/Goods/add.vue
 create mode 100644 src/components/Goods/goods_list.vue
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git status
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch                                                                                                           goods_cata
  goods_list
  goods_params
  login
* master
  rights
  user
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git checkout -b order                                                                                              Switched to a new branch 'order'
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch                                                                                                           goods_cata
  goods_list
  goods_params
  login
  master
* order
  rights
  user
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git push -u origin order                                                                                           Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-5.0]
remote: Create a pull request for 'order' on Gitee by visiting:
remote:     https://gitee.com/Iridescentcloud/myweb_5135/pull/new/Iridescentcloud:order...Iridescentcloud:master
To https://gitee.com/Iridescentcloud/myweb_5135.git
 * [new branch]      order -> order
Branch 'order' set up to track remote branch 'order' from 'origin'.
PS D:\毕业设计\乡村物流管理系统\myweb_5135>

15：提交order


尝试新的跨平台 PowerShell https://aka.ms/pscore6

PS D:\毕业设计\乡村物流管理系统\myweb_5135> git status
On branch goods_list
Your branch is up to date with 'origin/goods_list'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   package.json
        modified:   src/plugins/element.js
        modified:   src/router/index.js
        modified:   yarn.lock

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        src/components/Goods/add.vue

no changes added to commit (use "git add" and/or "git commit -a")
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  goods_cata
* goods_list
  goods_params
  login
  master
  rights
  user
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git add .
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git commit -m '完成商品功能开发'
 7 files changed, 553 insertions(+), 3 deletions(-)
 create mode 100644 src/components/Goods/add.vue
 create mode 100644 src/components/Goods/goods_list.vue
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git status
  goods_cata
  goods_list
  goods_params
  login
  master
* order
  rights
  user
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git status
On branch order

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   src/plugins/element.js
        modified:   src/router/index.js

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        src/plugins/timeline-item/
        src/plugins/timeline/
no changes added to commit (use "git add" and/or "git commit -a")
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git add .
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git status
On branch order
Your branch is up to date with 'origin/order'.

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        new file:   src/components/order/order.vue
        modified:   src/plugins/element.js
        new file:   src/plugins/timeline-item/index.js
        new file:   src/plugins/timeline-item/timeline-item(1).css
        new file:   src/plugins/timeline/index.js
        new file:   src/plugins/timeline/src/item.vue
        new file:   src/plugins/timeline/src/main.vue
        new file:   src/plugins/timeline/timeline.css
        modified:   src/router/index.js

PS D:\毕业设计\乡村物流管理系统\myweb_5135> git commit -m '完成了order订单' 
[order 5704bc8] 完成了order订单
 10 files changed, 13890 insertions(+), 1 deletion(-)
 create mode 100644 src/components/order/citydata.js
 create mode 100644 src/components/order/order.vue
 create mode 100644 src/plugins/timeline-item/index.js
 create mode 100644 src/plugins/timeline-item/timeline-item(1).css
 create mode 100644 src/plugins/timeline/index.js
 create mode 100644 src/plugins/timeline/src/item.vue
 create mode 100644 src/plugins/timeline/src/main.vue
 create mode 100644 src/plugins/timeline/timeline.css
Enumerating objects: 27, done.
Counting objects: 100% (27/27), done.
Delta compression using up to 8 threads
Compressing objects: 100% (19/19), done.
Writing objects: 100% (20/20), 34.71 KiB | 2.48 MiB/s, done.
Total 20 (delta 5), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-5.0]
To https://gitee.com/Iridescentcloud/myweb_5135.git
   b4fe7a2..5704bc8  order -> order
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  goods_cata
  goods_list
  goods_params
  login
* master
  order
  rights
  user
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git merge order
Updating b4fe7a2..5704bc8
Fast-forward
 src/components/order/citydata.js               | 13586 +++++++++++++++++++++++
 src/components/order/order.vue                 |   165 +
 src/plugins/element.js                         |     6 +-
 src/plugins/timeline-item/index.js             |     8 +
 src/plugins/timeline-item/timeline-item(1).css |     1 +
 src/plugins/timeline/index.js                  |     8 +
 src/plugins/timeline/src/item.vue              |    73 +
 src/plugins/timeline/src/main.vue              |    38 +
 src/plugins/timeline/timeline.css              |     1 +
 src/router/index.js                            |     5 +
 10 files changed, 13890 insertions(+), 1 deletion(-)
 create mode 100644 src/components/order/citydata.js
 create mode 100644 src/components/order/order.vue
 create mode 100644 src/plugins/timeline-item/index.js
 create mode 100644 src/plugins/timeline-item/timeline-item(1).css
 create mode 100644 src/plugins/timeline/index.js
 create mode 100644 src/plugins/timeline/src/item.vue
 create mode 100644 src/plugins/timeline/src/main.vue
 create mode 100644 src/plugins/timeline/timeline.css
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git push
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-5.0]
To https://gitee.com/Iridescentcloud/myweb_5135.git
   b4fe7a2..5704bc8  master -> master
PS D:\毕业设计\乡村物流管理系统\myweb_5135>

16:创建 report 分支

PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  goods_cata
  goods_list
  goods_params
  login
* master
  order
  rights
  user
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git checkout -b report
Switched to a new branch 'report'
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git branch
  goods_cata
  goods_list
  goods_params
  login
  master
  order
* report
  rights
  user
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git push -u origin report
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-5.0]
remote: Create a pull request for 'report' on Gitee by visiting:
remote:     https://gitee.com/Iridescentcloud/myweb_5135/pull/new/Iridescentcloud:report...Iridescentcloud:master
To https://gitee.com/Iridescentcloud/myweb_5135.git
 * [new branch]      report -> report
Branch 'report' set up to track remote branch 'report' from 'origin'.
PS D:\毕业设计\乡村物流管理系统\myweb_5135>


Windows PowerShell
版权所有 (C) Microsoft Corporation。保留所有权利。

尝试新的跨平台 PowerShell https://aka.ms/pscore6

PS D:\毕业设计\乡村物流管理系统\myweb_5135> git status
On branch report
Your branch is up to date with 'origin/report'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   package.json
        modified:   src/router/index.js
        modified:   yarn.lock

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        src/components/report/

no changes added to commit (use "git add" and/or "git commit -a")
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git add .
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git status
On branch report
Your branch is up to date with 'origin/report'.

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   package.json
        new file:   src/components/report/Report.vue
        modified:   src/router/index.js
        modified:   yarn.lock

PS D:\毕业设计\乡村物流管理系统\myweb_5135> git commit -m '完成了报表的开发'
[report e4990a1] 完成了报表的开发
 4 files changed, 104 insertions(+)
 create mode 100644 src/components/report/Report.vue
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git oush
git: 'oush' is not a git command. See 'git --help'.

The most similar command is
        push
PS D:\毕业设计\乡村物流管理系统\myweb_5135> git push
Enumerating objects: 17, done.
Counting objects: 100% (17/17), done.
Delta compression using up to 8 threads
Compressing objects: 100% (8/8), done.
Writing objects: 100% (10/10), 2.14 KiB | 1.07 MiB/s, done.
Total 10 (delta 6), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-5.0]
To https://gitee.com/Iridescentcloud/myweb_5135.git
   5704bc8..e4990a1  report -> report
PS D:\毕业设计\乡村物流管理系统\myweb_5135>