2024年最新GIT分布式版本控制系统 命令讲解入门_cvi git，2024年最新真香警告

既有适合小白学习的零基础资料，也有适合3年以上经验的小伙伴深入学习提升的进阶课程，涵盖了95%以上大数据知识点，真正体系化！

由于文件比较多，这里只是将部分目录截图出来，全套包含大厂面经、学习笔记、源码讲义、实战项目、大纲路线、讲解视频，并且后续会持续更新

需要这份系统化资料的朋友，可以戳这里获取

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master)
$ git reset --hard ffce8cd
HEAD is now at ffce8cd second commit

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master)
$ git reflog
ffce8cd (HEAD -> master) HEAD@{0}: reset: moving to ffce8cd
534cbd3 HEAD@{1}: commit: third commit
ffce8cd (HEAD -> master) HEAD@{2}: commit: second commit
26da280 HEAD@{3}: commit (initial): first commit

### 分支的操作




| **命令名称** | **作用** |
| --- | --- |
| **git branch 分支名** | **创建分支** |
| **git branch -v** | **查看当前分支** |
| **git checkout 分支名** | **切换分支** |
| **git merge 分支名** | **把指定的分支合并到当前分支上** |


#### 查看当前分支——git branch -v

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master)
$ git branch -v

• master 534cbd3 third commit

#### 创建分支——git branch 分支名

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master)
$ git branch hot-fix

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master)
$ git branch -v
hot-fix 534cbd3 third commit

• master 534cbd3 third commit

#### 切换分支——git checkout 分支名

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master)
$ git checkout hot-fix
Switched to branch ‘hot-fix’

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (hot-fix)
$

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (hot-fix)
$ git branch -v

• hot-fix 534cbd3 third commit
  master 534cbd3 third commit

#### 合并分支——git merge 分支名

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master)
$ git merge hot-fix
Updating 534cbd3…017517e
Fast-forward
hello.txt | 13 ++±---------
1 file changed, 3 insertions(+), 10 deletions(-)

#### 合并分支(冲突合并)


检测有文件有两处修改


###### 显示冲突

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master)
$ git merge hot-fix
Auto-merging hello.txt
CONFLICT (content): Merge conflict in hello.txt
Automatic merge failed; fix conflicts and then commit the result.

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master|MERGING)
$

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master|MERGING)
$ git status
On branch master
You have unmerged paths.
(fix conflicts and run “git commit”)
(use “git merge --abort” to abort the merge)

Unmerged paths:
(use “git add …” to mark resolution)
both modified: hello.txt

no changes added to commit (use “git add” and/or “git commit -a”)

###### 冲突合并

1.查看冲突代码

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master|MERGING)
$ vim hello.txt

<<<< HEAD 当前分支代码

<<<< HEAD 当前分支代码 =======

======= 合并分支代码 >>>>>>> hot-fix

#删除特殊符号 以及 重复代码

#2.添加到暂存区
ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master|MERGING)
$ git add hello.txt

#3.提交本地库(不能带文件名)
ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master|MERGING)
$ git commit -m “marge test”
fatal: cannot do a partial commit during a merge.

#4.切换分支查看
ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master)
$ git checkout hot-fix
Switched to branch ‘hot-fix’

#冲突合并，合并当前分支，不合并被合并分支

head —> master(分支内容)—>版本号

HEAD决定当前分支

### Git团队协作


![在这里插入图片描述](https://img-blog.csdnimg.cn/d3b89d4211fb4015863154c9054df430.png#pic_center)


![在这里插入图片描述](https://img-blog.csdnimg.cn/3c8a006feee54a9683ab574329082e68.png#pic_center)




| **命令名称** | **作用** |
| --- | --- |
| **git remote -v** | **查看当前所有进程地址别名** |
| **git remote add 别名 远程地址** | **起别名** |
| **git push 别名 分支** | **推送本地分支上的内容到远程仓库** |
| **git push 远程地址 分支** | **推送本地分支上的内容到远程仓库** |
| **git clone 远程地址** | **将远程仓库的内容克隆到本地** |
| **git pull 远程库地址别名 远程分支名** | **将远程仓库对于分支最新内容拉下来后与当前本地分支直接合并** |
| **git push -f 远程库地址别名 远程分支名** | **强制推送** |


#### 创建远程库别名



> 
> git remote -v #查看当前所有进程地址别名  
>  git remote add 别名 远程地址 #起别名
> 
> 
> 

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (hot-fix)
$ git remote -v

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (hot-fix)
$ git remote add git.demo https://github.com/weishuoHH/git-demo.git

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (hot-fix)
$ git remote -v
git.demo https://github.com/weishuoHH/git-demo.git (fetch)
git.demo https://github.com/weishuoHH/git-demo.git (push)

#### 推送本地分支上的内容到远程仓库



> 
> git push 别名 分支 #推送本地分支上的内容到远程仓库
> 
> 
> 

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master)
$ git push git.demo master
Enumerating objects: 21, done.
Counting objects: 100% (21/21), done.
Delta compression using up to 16 threads
Compressing objects: 100% (14/14), done.
Writing objects: 100% (21/21), 1.55 KiB | 792.00 KiB/s, done.
Total 21 (delta 4), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (4/4), done.
To https://github.com/weishuoHH/git-demo.git

• [new branch] master -> master

#### 拉取远程库到本地库



> 
> git pull 远程库地址别名 远程分支名
> 
> 
> 

$ git pull git@gitee.com:wei-shuo-red/travel.git master --allow-unrelated-histories

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master)
$ git pull git.demo master
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), 649 bytes | 64.00 KiB/s, done.
From https://github.com/weishuoHH/git-demo

• branch master -> FETCH_HEAD
  b129c29…d40c0cd master -> git.demo/master
  Updating b129c29…d40c0cd
  Fast-forward
  hello.txt | 1 +
  1 file changed, 1 insertion(+)

#### 克隆远程库到本地库



> 
> git clone 远程地址 将远程仓库的内容克隆到本地
> 
> 
> clone操作：  
>  1.拉取代码  
>  2.初始化本地库  
>  3.创建别名
> 
> 
> 

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-lhc
$ git clone https://github.com/weishuoHH/git-demo.git
Cloning into ‘git-demo’…
remote: Enumerating objects: 27, done.
remote: Counting objects: 100% (27/27), done.
remote: Compressing objects: 100% (14/14), done.
remote: Total 27 (delta 6), reused 20 (delta 4), pack-reused 0
Receiving objects: 100% (27/27), done.
Resolving deltas: 100% (6/6), done.

ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-lhc
$ ll
total 0
drwxr-xr-x 1 ws199 197609 0 Apr 17 14:27 git-demo/

#创建别名
ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-lhc/git-demo (master)
$ git remote -v
origin https://github.com/weishuoHH/git-demo.git (fetch)
origin https://github.com/weishuoHH/git-demo.git (push)

### GitHub免密登录



> 
> 生成ssh免密登录命令 -t "以某种加密算法登录 -C "描述
> 
> 
> 

ws199@DESKTOP-2N1I9JA MINGW64 ~
$ ssh-keygen.exe -t rsa -C weishuoHH@weishuo.com
Generating public/private rsa key pair.
Enter file in which to save the key (/c/Users/ws199/.ssh/id_rsa):
Created directory ‘/c/Users/ws199/.ssh’.
Enter passphrase (empty for no passphrase):
Enter same passphrase again:
Your identification has been saved in /c/Users/ws199/.ssh/id_rsa
Your public key has been saved in /c/Users/ws199/.ssh/id_rsa.pub
The key fingerprint is:
SHA256:CVIbj1aIxRUz8t0m7WXpzBqwJ6RzNHze+B5dd5Jyiwk weishuoHH@weishuo.com
The key’s randomart image is:
±–[RSA 3072]----+
| +=o*. |
| …oO = o . |
| . = o O = + |
| o . = X O . |
| S E B O +|
| o + O ++|
| + + .|
| . . |
| . |
±—[SHA256]-----+

ws199@DESKTOP-2N1I9JA MINGW64 ~

既有适合小白学习的零基础资料，也有适合3年以上经验的小伙伴深入学习提升的进阶课程，涵盖了95%以上大数据知识点，真正体系化！

由于文件比较多，这里只是将部分目录截图出来，全套包含大厂面经、学习笔记、源码讲义、实战项目、大纲路线、讲解视频，并且后续会持续更新

需要这份系统化资料的朋友，可以戳这里获取

ws199@DESKTOP-2N1I9JA MINGW64 ~

[外链图片转存中…(img-ktLhLg4D-1715648263073)]
[外链图片转存中…(img-20S7i58i-1715648263073)]
[外链图片转存中…(img-50PSOYti-1715648263074)]

既有适合小白学习的零基础资料，也有适合3年以上经验的小伙伴深入学习提升的进阶课程，涵盖了95%以上大数据知识点，真正体系化！

由于文件比较多，这里只是将部分目录截图出来，全套包含大厂面经、学习笔记、源码讲义、实战项目、大纲路线、讲解视频，并且后续会持续更新

需要这份系统化资料的朋友，可以戳这里获取