一篇博客带你上手Git

概述

安装Git

下载官方网站，下载后安装包样式：双击安装，安装成功后右键文件会有如下选项证明安装成功。

基本配置

设置用户信息，桌面右键，选择Git bash here

hecheng@LAPTOP-OJQFEH00 MINGW64 ~/Desktop

$ git config --global user.name "hecheng"

hecheng@LAPTOP-OJQFEH00 MINGW64 ~/Desktop

$ git config --global user.email "hecheng@qq.com"

自己编写自己的用户名和邮箱，之后可以查看，效果如下

基本操作

创建文件——>提交到缓存区——>提交到仓库

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest

$ git init

Initialized empty Git repository in E:/GitTest/.git/

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ ll

total 8

drwxr-xr-x 1 hecheng 197121 0  7月 17 16:18 ./

drwxr-xr-x 1 hecheng 197121 0  7月 17 16:17 ../

drwxr-xr-x 1 hecheng 197121 0  7月 17 16:18 .git/

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ touch file01.txt

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git status

On branch master

No commits yet

Untracked files:

  (use "git add <file>..." to include in what will be committed)

        file01.txt

nothing added to commit but untracked files present (use "git add" to track)

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git add .

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git status

On branch master

No commits yet

Changes to be committed:

  (use "git rm --cached <file>..." to unstage)

        new file:   file01.txt

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git commit -m "add file01"

[master (root-commit) e205281] add file01

 1 file changed, 0 insertions(+), 0 deletions(-)

 create mode 100644 file01.txt

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git status

On branch master

nothing to commit, working tree clean

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git log

commit e2052811960420feb66b8b7bef48980537ea859b (HEAD -> master)

Author: hecheng <hecheng@qq.com>

Date:   Mon Jul 17 16:30:35 2023 +0800

    add file01

修改文件后，文件又进入工作区

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git status

On branch master

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:   file01.txt

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

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git add .

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git status

On branch master

Changes to be committed:

  (use "git restore --staged <file>..." to unstage)

        modified:   file01.txt

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git commit -m "update file01"

[master 033fcd2] update file01

 1 file changed, 1 insertion(+)

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git log

commit 033fcd2c7386e611bff68c325ab2c770e075f014 (HEAD -> master)

Author: hecheng <hecheng@qq.com>

Date:   Mon Jul 17 16:36:21 2023 +0800

    update file01

commit e2052811960420feb66b8b7bef48980537ea859b

Author: hecheng <hecheng@qq.com>

Date:   Mon Jul 17 16:30:35 2023 +0800

    add file01

版本回退

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git-log

* 033fcd2 (HEAD -> master) update file01

* e205281 add file01

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git reset --hard e205281

HEAD is now at e205281 add file01

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git-log

* e205281 (HEAD -> master) add file01

查看已删除的记录

$ git reflog

033fcd2 (HEAD -> master) HEAD@{0}: reset: moving to 033fcd2

e205281 HEAD@{1}: reset: moving to e205281

033fcd2 (HEAD -> master) HEAD@{2}: commit: update file01

e205281 HEAD@{3}: commit (initial): add file01

Git分支

查看，创建，切换分支

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git branch

* master

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git branch dev01

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git-log

* 033fcd2 (HEAD -> master, dev01) update file01

* e205281 add file01

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ touch .gitignore

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git status

On branch master

Untracked files:

  (use "git add <file>..." to include in what will be committed)

        .gitignore

nothing added to commit but untracked files present (use "git add" to track)

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git add .

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git status

On branch master

Changes to be committed:

  (use "git restore --staged <file>..." to unstage)

        new file:   .gitignore

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git commit -m "add ignore file"

[master 4008424] add ignore file

 1 file changed, 1 insertion(+)

 create mode 100644 .gitignore

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git status

On branch master

nothing to commit, working tree clean

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git-log

* 4008424 (HEAD -> master) add ignore file

* 033fcd2 (dev01) update file01

* e205281 add file01

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git checkout dev01

Switched to branch 'dev01'

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (dev01)

$ git checkout master

Switched to branch 'master'

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git checkout -b dev02

Switched to a new branch 'dev02'

合并、删除分支

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (dev02)

$ git checkout master

Switched to branch 'master'

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git-log

* 4008424 (HEAD -> master, dev02) add ignore file

* 033fcd2 (dev01) update file01

* e205281 add file01

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git checkout dev01

Switched to branch 'dev01'

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (dev01)

$ touch file02.txt

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (dev01)

$ git add .

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (dev01)

$ git commit -m 'add file02'

[dev01 f2a85f1] add file02

 1 file changed, 0 insertions(+), 0 deletions(-)

 create mode 100644 file02.txt

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (dev01)

$ git-log

* f2a85f1 (HEAD -> dev01) add file02

| * 4008424 (master, dev02) add ignore file

|/

* 033fcd2 update file01

* e205281 add file01

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (dev01)

$ git checkout master

Switched to branch 'master'

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git merge dev01

Merge made by the 'ort' strategy.

 file02.txt | 0

 1 file changed, 0 insertions(+), 0 deletions(-)

 create mode 100644 file02.txt

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git-log

*   c3ebaa2 (HEAD -> master) Merge branch 'dev01'

|\

| * f2a85f1 (dev01) add file02

* | 4008424 (dev02) add ignore file

|/

* 033fcd2 update file01

* e205281 add file01

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git branch -d dev02

Deleted branch dev02 (was 4008424).

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git-log

*   c3ebaa2 (HEAD -> master) Merge branch 'dev01'

|\

| * f2a85f1 (dev01) add file02

* | 4008424 add ignore file

|/

* 033fcd2 update file01

* e205281 add file01

强制删除

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git-log

* 88d63ff (dev02) abcde

*   b357906 (HEAD -> master) Merge branch 'dev'

|\

| * b6c3192 update file01 count-2

* | d9ed7d0 update file01 count-3

|/

*   c3ebaa2 Merge branch 'dev01'

|\

| * f2a85f1 add file02

* | 4008424 add ignore file

|/

* 033fcd2 update file01

* e205281 add file01

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git branch -d dev02

error: The branch 'dev02' is not fully merged.

If you are sure you want to delete it, run 'git branch -D dev02'.

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git branch -D dev02

Deleted branch dev02 (was 88d63ff).

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git-log

*   b357906 (HEAD -> master) Merge branch 'dev'

|\

| * b6c3192 update file01 count-2

* | d9ed7d0 update file01 count-3

|/

*   c3ebaa2 Merge branch 'dev01'

|\

| * f2a85f1 add file02

* | 4008424 add ignore file

|/

* 033fcd2 update file01

* e205281 add file01

解决冲突

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git checkout -b dev

Switched to a new branch 'dev'

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (dev)

$ git status

On branch dev

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:   file01.txt

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

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (dev)

$ git add .

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (dev)

$ git commit -m "update file01 count-2"

[dev b6c3192] update file01 count-2

 1 file changed, 1 insertion(+), 1 deletion(-)

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (dev)

$ git-log

* b6c3192 (HEAD -> dev) update file01 count-2

*   c3ebaa2 (master) Merge branch 'dev01'

|\

| * f2a85f1 add file02

* | 4008424 add ignore file

|/

* 033fcd2 update file01

* e205281 add file01

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (dev)

$ git checkout master

Switched to branch 'master'

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git add .

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git commit -m "update file01 count-3"

[master d9ed7d0] update file01 count-3

 1 file changed, 1 insertion(+), 1 deletion(-)

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

Merge branch 'dev'

[master b357906] Merge branch 'dev'

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git-log

*   b357906 (HEAD -> master) Merge branch 'dev'

|\

| * b6c3192 (dev) update file01 count-2

* | d9ed7d0 update file01 count-3

|/

*   c3ebaa2 Merge branch 'dev01'

|\

| * f2a85f1 add file02

* | 4008424 add ignore file

|/

* 033fcd2 update file01

* e205281 add file01

分支创建原则

master，主分支，用于发行的版本，develop，开发的分支，feature（可以删除），功能的分支，hotfix，修复bug的分支，feature合并到develop，develop合并到master，用户反馈到bug，创建hotfix分支，写好修复代码后，分别合并到master分支和develop分支。

四、远程仓库

1.

创建码云账户，创建仓库，获取公匙。

再连接本地仓库与远程仓库（添加远程仓库：git remote add 远端名称仓库路径），查看远程仓库，将代码推送到远程仓库（git push 远端名称本地分支名：远端分支名），查看关联关系：git branch -vv

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git remote add origin git@gitee.com:hecheng11223/git_-test.git

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git remote

origin

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git push origin master

Enumerating objects: 22, done.

Counting objects: 100% (22/22), done.

Delta compression using up to 16 threads

Compressing objects: 100% (14/14), done.

Writing objects: 100% (22/22), 1.82 KiB | 621.00 KiB/s, done.

Total 22 (delta 3), reused 0 (delta 0), pack-reused 0

remote: Powered by GITEE.COM [GNK-6.4]

To gitee.com:hecheng11223/git_-test.git

 * [new branch]      master -> master

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git push origin master:master

Everything up-to-date

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git push --set-upstream origin master

Everything up-to-date

branch 'master' set up to track 'origin/master'.

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git push

Everything up-to-date

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/GitTest (master)

$ git branch -vv

* master b357906 [origin/master] Merge branch 'dev'

2.

从远程仓库克隆

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/Git_Study

$ git clone git@gitee.com:hecheng11223/git_-test.git hello-git

Cloning into 'hello-git'...

remote: Enumerating objects: 22, done.

remote: Counting objects: 100% (22/22), done.

remote: Compressing objects: 100% (14/14), done.

remote: Total 22 (delta 3), reused 0 (delta 0), pack-reused 0

Receiving objects: 100% (22/22), done.

Resolving deltas: 100% (3/3), done.

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/Git_Study/hello-git (master)

$ git-log

*   b357906 (HEAD -> master, origin/master, origin/HEAD) Merge branch 'dev'

|\

| * b6c3192 update file01 count-2

* | d9ed7d0 update file01 count-3

|/

*   c3ebaa2 Merge branch 'dev01'

|\

| * f2a85f1 add file02

* | 4008424 add ignore file

|/

* 033fcd2 update file01

* e205281 add file01

从远程仓库抓取和拉取

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/Git_Study/hello-git (master)

$ git fetch

remote: Enumerating objects: 3, done.

remote: Counting objects: 100% (3/3), done.

remote: Compressing objects: 100% (2/2), done.

remote: Total 2 (delta 1), reused 0 (delta 0), pack-reused 0

Unpacking objects: 100% (2/2), 229 bytes | 76.00 KiB/s, done.

From gitee.com:hecheng11223/git_-test

   b357906..c9b33a5  master     -> origin/master

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/Git_Study/hello-git (master)

$ git-log

* c9b33a5 (origin/master, origin/HEAD) add file03

*   b357906 (HEAD -> master) Merge branch 'dev'

|\

| * b6c3192 update file01 count-2

* | d9ed7d0 update file01 count-3

|/

*   c3ebaa2 Merge branch 'dev01'

|\

| * f2a85f1 add file02

* | 4008424 add ignore file

|/

* 033fcd2 update file01

* e205281 add file01

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/Git_Study/hello-git (master)

$ git merge origin/master

Updating b357906..c9b33a5

Fast-forward

 file04.txt | 0

 1 file changed, 0 insertions(+), 0 deletions(-)

 create mode 100644 file04.txt

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/Git_Study/hello-git (master)

$ git pull

remote: Enumerating objects: 3, done.

remote: Counting objects: 100% (3/3), done.

remote: Compressing objects: 100% (2/2), done.

remote: Total 2 (delta 1), reused 0 (delta 0), pack-reused 0

Unpacking objects: 100% (2/2), 208 bytes | 69.00 KiB/s, done.

From gitee.com:hecheng11223/git_-test

   c9b33a5..418f89f  master     -> origin/master

Updating c9b33a5..418f89f

Fast-forward

 file05.txt | 0

 1 file changed, 0 insertions(+), 0 deletions(-)

 create mode 100644 file05.txt

hecheng@LAPTOP-OJQFEH00 MINGW64 /e/Git_Study/hello-git (master)

$ git-log

* 418f89f (HEAD -> master, origin/master, origin/HEAD) add file05

* c9b33a5 add file03

*   b357906 Merge branch 'dev'

|\

| * b6c3192 update file01 count-2

* | d9ed7d0 update file01 count-3

|/

*   c3ebaa2 Merge branch 'dev01'

|\

| * f2a85f1 add file02

* | 4008424 add ignore file

|/

* 033fcd2 update file01

* e205281 add file01

一篇博客带你上手Git的更多相关文章

一篇博客带你学会MyBatis
概念 MyBatis是一款持久层框架,用于简化JDBC操作(JavaEE三层架构:表现层(用来做页面的代码),业务层(业务逻辑代码),持久层(对数据库操作的代码))(框架就是一个半成品软件,是一套可重 ...
一篇博客带你入门Flask
一. Python 现阶段三大主流Web框架 Django Tornado Flask 对比 1.Django 主要特点是大而全,集成了很多组件,例如: Models Admin Form 等等, 不 ...
一篇博客带你轻松应对java面试中的多线程与高并发
1. Java线程的创建方式 (1)继承thread类 thread类本质是实现了runnable接口的一个实例,代表线程的一个实例.启动线程的方式start方法.start是一个本地方法,执行后,执 ...
一篇博客带你轻松应对Springboot面试
1. SpringBoot简介 SpringBoot是简化Spring应用开发的一个框架.他整合了Spring的技术栈,提供各种标准化的默认配置.使得我们可以快速开发Spring项目,免掉xml配置的 ...
一遍博客带你上手Servlet
概念 Servlet其实就是Java提供的一门动态web资源开发技术.本质就是一个接口. 快速入门创建web项目,导入servlet依赖坐标(注意依赖范围scope,是provided,只在编译和测 ...
通通的最后一篇博客（附自制html5平面射击小游戏一枚）
这是我最后一篇博客了,由于本人的人生规划吧,以后应该也写不出什么好的技术文章了,到现在在博客园写了2年, 今天一看,我也有了120个粉丝,好几万的浏览量,感谢大家的支持啊~~ 半年没有写博客了,由于半 ...
第一篇博客 ---- 分享关于Maven使用的一些技巧
Maven环境搭建在官网上下载maven安装包,地址:http://maven.apache.org/download.cgi . 解压文件到电脑坐在盘符目录,如E:\apache-maven-3. ...
小白两篇博客熟练操作MySQL 之第二篇
小白两篇博客熟练操作MySQL 之第二篇一. 视图视图是一个虚拟表,其本质是根据SQL语句获取动态的数据集,并为其命名,用户使用时只需使用名称即可获取结果集, 并可以将其当做表来使用. s ...
鸿蒙内核源码分析(编译脚本篇) | 如何防编译环境中的牛皮癣 | 百篇博客分析OpenHarmony源码 | v58.01
百篇博客系列篇.本篇为: v58.xx 鸿蒙内核源码分析(环境脚本篇) | 编译鸿蒙原来如此简单 | 51.c.h.o 本篇用两个脚本完成鸿蒙(L1)的编译环境安装/源码下载/编译过程,让编译,调试鸿 ...
鸿蒙内核源码分析(ELF解析篇) | 你要忘了她姐俩你就不是银 | 百篇博客分析OpenHarmony源码 | v53.02
百篇博客系列篇.本篇为: v53.xx 鸿蒙内核源码分析(ELF解析篇) | 你要忘了她姐俩你就不是银 | 51.c.h.o 加载运行相关篇为: v51.xx 鸿蒙内核源码分析(ELF格式篇) | 应 ...

随机推荐

【Docker】容器管理
一.容器生命周期及启动过程 1.容器生命周期 2.容器启动过程二.容器管理命令 Usage: docker [OPTIONS] COMMAND A self-sufficient runtime f ...
OFFICE-利用Word邮件合并功能联动编辑《目标责任成本调整说明》
正文 00.开始以及目标 0.1 开始众所周知的原因,X建工的很多文档都提供了一个填写模板,这是个好事.但是捏,当他们把模板放下来要来填数的时候,你会发现所有的数据,都是在不同的文档中搬来搬去,这点 ...
在C#中使用SQLite数据库
轻量级桌面程序数据库不太适合用SQLServer.MySQL之类的重量级数据库,嵌入式数据库更好.在对比Access.SQLite.Firebird数据库后发现SQLite较另外两个有较多优点. 环境 ...
2021-07-15：接雨水 II。给你一个 m x n 的矩阵，其中的值均为非负整数，代表二维高度图每个单元的高度，请计算图中形状最多能接多少体积的雨水。
2021-07-15:接雨水 II.给你一个 m x n 的矩阵,其中的值均为非负整数,代表二维高度图每个单元的高度,请计算图中形状最多能接多少体积的雨水. 福大大答案2021-07-15: 小根堆 ...
java中this的内存原理以及成员变量和局部变量
this的内存原理 1.this的作用: 区分局部变量和成员变量 eg: public class Student{ private int age; public void method(){ in ...
jmeter如何保存变量到结果jtl文件里
将变量保存到结果jtl文件里,可以方便的在generate报告时,自行取用jtl中的变量进行展示,实现过程如下: 1.打开jmeter/bin目录下的jmeter.properties文件,将变量名加 ...
500行代码手写docker-以新命名空间运行程序
(2)500行代码手写docker-以新命名空间运行程序本系列教程主要是为了弄清楚容器化的原理,纸上得来终觉浅,绝知此事要躬行,理论始终不及动手实践来的深刻,所以这个系列会用go语言实现一个类似do ...
Cobalt Strike 连接启动教程，制作图片🐎（2）
扫描有两种方式:arp 和 icmp 查看进程列表攻击----生成后门-----Payload 可以生成各类语言免杀牧马---(输出:选择C或者python或者php) go.咕.com 生成c语言 ...
如何在前端应用中合并多个 Excel 工作簿
本文由葡萄城技术团队于博客园原创并首发.葡萄城为开发者提供专业的开发工具.解决方案和服务,赋能开发者. 前言|问题背景 SpreadJS是纯前端的电子表格控件,可以轻松加载 Excel 工作簿中的数据 ...
在树莓派上实现numpy的conv2d卷积神经网络做图像分类，加载pytorch的模型参数，推理mnist手写数字识别，并使用多进程加速
这几天又在玩树莓派,先是搞了个物联网,又在尝试在树莓派上搞一些简单的神经网络,这次搞得是卷积识别mnist手写数字识别训练代码在电脑上,cpu就能训练,很快的: import torch impor ...