git系列1-常用命令

克隆远程版本库

git clone <url>

分支

## 若 -b 则是切换并创建新的分支，从当前节点
## 注意 切换分支前需 commit
lyq@DESKTOP-40030BI MINGW64 ~/workspace/CTFS-BS (feature-course)
$ git branch
  develop
* feature-course
  feature-refresh
  feature-review
  feature-teacher
  master
  new-feature
  test
(base)
lyq@DESKTOP-40030BI MINGW64 ~/workspace/CTFS-BS (feature-course)
$ git checkout feature-teacher            --切换分支
Switched to branch 'feature-teacher'
(base)
lyq@DESKTOP-40030BI MINGW64 ~/workspace/CTFS-BS (feature-teacher)
$ git branch -D new-feature                  --删除分支
Deleted branch new-feature (was de27e3c).
(base)
lyq@DESKTOP-40030BI MINGW64 ~/workspace/CTFS-BS (feature-teacher)
$ git branch -D feature-teacher             --无法删除当前分支
error: Cannot delete branch 'feature-teacher' checked out at 'C:/Users/lyq/workspace/CTFS-BS'
(base)
lyq@DESKTOP-40030BI MINGW64 ~/workspace/CTFS-BS (feature-teacher)
$ git checkout feature-course
Switched to branch 'feature-course'
Your branch is up to date with 'origin/feature-course'.
(base)
lyq@DESKTOP-40030BI MINGW64 ~/workspace/CTFS-BS (feature-course)
$ git branch -D feature-teacher                --先checkout再删除
Deleted branch feature-teacher (was 5941119).
(base)

查看状态

lyq@DESKTOP-40030BI MINGW64 ~/workspace/CTFS-BS (feature-course)
$ git status
On branch feature-course
Your branch is ahead of 'origin/feature-course' by 157 commits.
  (use "git push" to publish your local commits)
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
        modified:   .gitignore
no changes added to commit (use "git add" and/or "git commit -a")
(base)
lyq@DESKTOP-40030BI MINGW64 ~/workspace/CTFS-BS (feature-course)
$ git commit -am 'over user reset'

查看提交历史

lyq@DESKTOP-40030BI MINGW64 ~/workspace/CTFS-BS (feature-course)
$ git log
commit 80e4c54d14639e68b385552375b0510bfb3c9ae3 (HEAD -> feature-course, origin/feature-course)
Author: 刘小姐 <liuyunqing@chainbb.ai>
Date:   Thu Jul 4 18:12:14 2019 +0800
    over user reset
commit b2a6b8c66be435c7a9a6b5c2a4e66ad4a8f2ff68
Author: 刘小姐 <liuyunqing@chainbb.ai>
Date:   Thu Jul 4 18:10:49 2019 +0800
    over user reset
commit e0cc281d18ab08d3e8ce628e41726f230c306dce
Author: 刘小姐 <liuyunqing@chainbb.ai>
Date:   Thu Jul 4 16:11:15 2019 +0800
    still fix token
(base)
lyq@DESKTOP-40030BI MINGW64 ~/workspace/CTFS-BS (feature-course)
$

下载代码并合并

lyq@DESKTOP-40030BI MINGW64 ~/workspace/CTFS-BS (develop)
$ git pull origin develop
From chain-gitlab:CTFS_Group/CTFS-BS
 * branch            develop    -> FETCH_HEAD
Already up to date.
(base)
// 使用 -u 把本地的develop和远程的develop绑定后
lyq@DESKTOP-40030BI MINGW64 ~/workspace/CTFS-BS (develop)
$ git pull

上传代码

lyq@DESKTOP-40030BI MINGW64 ~/workspace/CTFS-BS (feature-course)
$ git push origin feature-course
Enumerating objects: 97, done.
Counting objects: 100% (87/87), done.
Delta compression using up to 12 threads
Compressing objects: 100% (65/65), done.
Writing objects: 100% (65/65), 7.93 KiB | 1015.00 KiB/s, done.
Total 65 (delta 47), reused 0 (delta 0)
remote:
remote: To create a merge request for feature-course, visit:
remote:   http://192.168.1.202/CTFS_Group/CTFS-BS/merge_requests/new?merge_request%5Bsource_branch%5D=feature-course
remote:
To chain-gitlab:CTFS_Group/CTFS-BS.git
   8fdcaa2..80e4c54  feature-course -> feature-course
(base)
// 使用 -u 把本地的develop和远程的develop绑定后
lyq@DESKTOP-40030BI MINGW64 ~/workspace/CTFS-BS (develop)
$ git push