Git常用操作

qq_25500415

已于 2023-09-07 13:05:58 修改

阅读量1.4k

点赞数

分类专栏： git 文章标签： git

于 2023-06-19 19:13:19 首次发布

本文链接：https://blog.csdn.net/qq_25500415/article/details/131292325

版权

git 专栏收录该内容

1 篇文章 0 订阅

订阅专栏

6-1，撤销工作区中的修改(checkout)

10-1，创建并切换分支(checkout)

11-3-1，恢复stash，但不删除暂存区记录

11-3-2，恢复stash，且删除暂存区记录

14-1-1，不指定commit id创建标签

14-1-2，指定commit id创建标签

15-1， FAQ1：Permission denied (publickey)

1， git配置

通过命令配置用户名和邮箱

git config --global user.name "用户名"

git config --global user.email "邮箱"

选项"--global"表示你这台机器上的所有仓库都会使用这个配置

2，创建本地仓库

1，创建空目录

2，在空目录中打开git bash，并输入git init

Administrator@SDH-20190824RDE MINGW64 /d/git_learn
$ git init
Initialized empty Git repository in D:/git_learn/.git/

3，添加文件到仓库

3-1，添加文件(add)

通过命令"git add 文件名"，可添加文件到仓库的暂存区

Administrator@SDH-20190824RDE MINGW64 /d/git_learn (master)
$ git add readme.txt

3-2，提交(commit)

通过命令"git commit -m 提交说明"， 可添加暂存区的文件到仓库

Administrator@SDH-20190824RDE MINGW64 /d/git_learn (master)
$ git commit -m "add readme.txt"
[master (root-commit) a39d8a1] add readme.txt
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 readme.txt

4，版本回退(reset)

要进行版本回退，需要知道回退版本的commit id

4-1，查询历史版本commit id

1，通过命令"git log"，可查询历史版本的commit id

# 查询历史版本commit id
$ git log
commit 806da9ef174ce56e050b56d7ff58a5c5df55b3a7 (HEAD -> master)
Author: aa <aa@163.com>
Date:   Mon Jun 19 17:45:12 2023 +0800

    version2

commit 74a472c10aa662fdc111d138e9863d77258a0c6a
Author: aa <aa@163.com>
Date:   Mon Jun 19 17:44:33 2023 +0800

    version1

commit a39d8a1324a1017d5ba7a73256e7e9fb7a5d6b5e
Author: aa <aa@163.com>
Date:   Mon Jun 19 17:40:08 2023 +0800

    add readme.txt

2，查询git提交记录：git reflog, 该方法可以显示更多的提交记录

$ git reflog
a39d8a1 (HEAD -> master) HEAD@{0}: reset: moving to a39d8a1324a1017d5ba7a73256e7e9fb7a5d6b5e
806da9e HEAD@{1}: commit: version2
74a472c HEAD@{2}: commit: version1
a39d8a1 (HEAD -> master) HEAD@{3}: commit (initial): add readme.txt

4-2，根据commit id回退版本

通过命令"git reset --hard commit id"，可进行版本回退

特殊commit id：HEAD表示当前版本， HEAD^表示上个版本，HEAD^^表示上上版本

前100个版本使用HEAD~100

$ git reset --hard a39d8a1324a1017d5ba7a73256e7e9fb7a5d6b5e
HEAD is now at a39d8a1 add readme.txt

5，工作区，暂存区，仓库

5-1，工作区

新建或者修改的文件，都会在记录到工作区中

5-2，暂存区

通过git add后的文件，记录到暂存区

5-3，仓库

通过git commit后的文件，记录到仓库中

bash中查看工作区与仓库中同一个文件的改动：git diff HEAD -- "文件名"

$ git diff HEAD -- readme.txt
diff --git a/readme.txt b/readme.txt
index 7e6ad52..44d2c33 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1 +1 @@
-this is version2
+this is version21

6，撤销修改

6-1，撤销工作区中的修改(checkout)

通过命令git checkout -- 文件名或者git restore 文件名，均可撤销工作区中文件的修改

# 通过git checkout -- readme.txt撤销readme.txt文件的修改
$ git checkout -- readme.txt

Administrator@SDH-20190824RDE MINGW64 /d/git_learn (master)
$ git status
On branch master
nothing to commit, working tree clean

# 通过git restore撤销文件readme.txt的修改
$ git restore readme.txt

Administrator@SDH-20190824RDE MINGW64 /d/git_learn (master)
$ git status
On branch master
nothing to commit, working tree clean

Administrator@SDH-20190824RDE MINGW64 /d/git_learn (master)

6-2，撤销暂存区中的修改(reset)

通过命令"git reset HEAD 文件名"将暂存区的修改撤销掉，此时文件回到工作区，再使用"git checkout --文件名"丢弃工作区的修改

说明：暂存区中的文件修改后，若直接使用命令"git checkout --文件名"的方式，仅能修改回暂存区状态

新方法：暂存区中撤销修改：使用命令，git restore --staged "文件名"， 再使用命令git restore "文件名"

$ git status
On branch master
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   readme.txt


Administrator@SDH-20190824RDE MINGW64 /d/git_learn (master)
$ git restore --staged readme.txt

Administrator@SDH-20190824RDE MINGW64 /d/git_learn (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:   readme.txt

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

Administrator@SDH-20190824RDE MINGW64 /d/git_learn (master)
$ git restore readme.txt

Administrator@SDH-20190824RDE MINGW64 /d/git_learn (master)
$ git status
On branch master
nothing to commit, working tree clean

6-3，撤销仓库中的修改(reset)

通过版本回退命令"git reset --hard commit id"即可

7，删除文件(rm)

7-1，确实需要删除

通过命令"git rm 文件名"，然后再使用命令"git commit 说明"，可删除仓库中的文件

Administrator@SDH-20190824RDE MINGW64 /d/git_learn (master)
$ git status
On branch master
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)
        deleted:    read.txt

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

Administrator@SDH-20190824RDE MINGW64 /d/git_learn (master)
$ git rm read.txt
rm 'read.txt'

Administrator@SDH-20190824RDE MINGW64 /d/git_learn (master)
$ git commit -m "delete read.txt"
[master 4a909cc] delete read.txt
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 read.txt

Administrator@SDH-20190824RDE MINGW64 /d/git_learn (master)
$ git status
On branch master
nothing to commit, working tree clean

Administrator@SDH-20190824RDE MINGW64 /d/git_learn (master)
$ ls
readme.txt

7-2，误删文件

通过命令命令"git checkout -- 文件名"(其实是从仓库中进行恢复的)，可恢复误删的文件

Administrator@SDH-20190824RDE MINGW64 /d/git_learn (master)
$ rm read1.txt

Administrator@SDH-20190824RDE MINGW64 /d/git_learn (master)
$ git status
On branch master
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)
        deleted:    read1.txt

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

Administrator@SDH-20190824RDE MINGW64 /d/git_learn (master)
$ git checkout -- read1.txt

Administrator@SDH-20190824RDE MINGW64 /d/git_learn (master)
$ git status
On branch master
nothing to commit, working tree clean

8，关联远程仓库

8-1，创建SSH Key

在git bash中输入命令：ssh-keygen -t rsa -C "youremail@example.com"

ssh-keygen -t rsa -C "youremail@example.com"

命令执行后，可以在用户目录下生产秘钥

8-2， GitHub上配置key

8-3， GitHub上新建仓库

8-4，本地仓库关联远程仓库

本地仓库的git bash中输入命令"git remote add origin git@github.com:用户名/仓库名"，可关联远程仓库

说明：git@github.com:用户名/仓库名：该部分是远程仓库信息

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (master)
$ git remote add origin git@github.com:aa/python_core_programming_exercises_1

8-5，推送本地分支到远端

通过命令"git push -u origin main"， 这里的main表示主分支，可推送本地分支到远端

$ git push -u origin main
The authenticity of host 'github.com (140.82.112.4)' can't be established.
ECDSA key fingerprint is SHA256:p2QAMXNIC1TJYWeIOttrVc98/R1BUFWu3/LiyKgUfQM.
Are you sure you want to continue connecting (yes/no/[fingerprint])? yes
Warning: Permanently added 'github.com,140.82.112.4' (ECDSA) to the list of known hosts.
Enumerating objects: 6, done.
Counting objects: 100% (6/6), done.
Delta compression using up to 12 threads
Compressing objects: 100% (4/4), done.
Writing objects: 100% (6/6), 540 bytes | 135.00 KiB/s, done.
Total 6 (delta 0), reused 0 (delta 0)
To github.com:yuanlingxiang/python_core_programming_exercises_1
 * [new branch]      main -> main
Branch 'main' set up to track remote branch 'main' from 'origin'.

8-6，解除远程仓库关联

通过命令"git rm remote 仓库名称"，可解除本地仓库与远程仓库关联

删除前建议通过命令"git remote -v"查询远程仓库信息

$ git remote -v
origin  git@github.com:aa/python_core_programming_exercises_1 (fetch)
origin  git@github.com:aa/python_core_programming_exercises_1 (push)

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (main)
$ git remote rm origin

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (main)
$

说明：这里的删除只是删除本地与远程仓库的关联

9，克隆远程仓库

1，在Github的如下界面，拷贝命令进行克隆

在本地的随意空目录中通过命令

"git clone git@github.com:aa/python_core_programming_exercises_1.git", 可clone远程仓库到本地

Administrator@SDH-20190824RDE MINGW64 /d
$ git clone git@github.com:aa/python_core_programming_exercises_1.git
Cloning into 'python_core_programming_exercises_1'...
remote: Enumerating objects: 6, done.
remote: Counting objects: 100% (6/6), done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 6 (delta 0), reused 6 (delta 0), pack-reused 0
Receiving objects: 100% (6/6), done.

克隆的远端仓库后，本地只有main分支，需要通过手动创建dev分支，通过命令 git switch -c dev origin/dev

说明：这里的dev为本地分支， origin/dev为远端分支

Administrator@SDH-20190824RDE MINGW64 /d/adf/python_core_programming_exercises_1 (main)
$ git switch -c dev origin/dev
Switched to a new branch 'dev'
Branch 'dev' set up to track remote branch 'dev' from 'origin'.

Administrator@SDH-20190824RDE MINGW64 /d/adf/python_core_programming_exercises_1 (dev)
$ git branch
* dev
  main

通过命令"git branch --set-upstream-to=origin/dev dev", 与远端关联

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (dev)
$ git branch --set-upstream-to=origin/dev dev
Branch 'dev' set up to track remote branch 'dev' from 'origin'.

说明：只有创建本地与远端分支关联后才能pull或push代码

10，分支

10-1，创建并切换分支(checkout)

通过命令git checkout -b "分支名"(或者git switch -c 分支名)，可创建分支，并切换到创建的分支上去

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (main)
$ git checkout -b dev
Switched to a new branch 'dev'

10-2，查询分支(branch)

# 当前分支前有"*"号存在，即dev是当前分支
Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (dev)
$ git branch
* dev
  main

10-3，切换分支

通过命令"git checkout 分支名"（或者命令git switch 分支名），可切换到指定分支

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (dev)

# 切换到main分支
$ git checkout main
Switched to branch 'main'
Your branch is up to date with 'origin/main'.

10-4，合并分支

通过命令"git merge 分支名"， 可合并指定分支到当前分支上

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (main)
# 合并dev分支到当前分支
$ git merge dev
Updating 7417b04..5a30a08
Fast-forward
 readme.txt | 2 ++
 1 file changed, 2 insertions(+)

10-5，删除分支

通过命令"git branch -d 分支名"，可删除指定的分支

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (main)
# 删除dev分支
$ git branch -d dev
Deleted branch dev (was 5a30a08).

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (main)
$ git branch
* main

11，解决冲突

当两个分支的修改都提交到仓库中，且修改点不同时，在合并的时候回产生冲突

这是需要修改一个合并分支的修改点与HEAD版本一致后，再次添加，提交就可解决冲突

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (main|MERGING)
$ cat readme.txt
Git is a distributed version control system
Git is free software distributed under the GPL
dfasfaf
<<<<<<< HEAD
fdafadfadfadf or bbbb
=======
fdafadfadfadf and fdafsa
>>>>>>> feature1

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (main|MERGING)
$ vi readme.txt

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (main|MERGING)
$ git add readme.txt

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (main|MERGING)
$ git commit -m "conflict fixed"
[main f37ef57] conflict fixed

可以通过命令：git log --graph --pretty=oneline --abbrev-commit查看分支的合并情况

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (main)
$ git log --graph --pretty=oneline --abbrev-commit
*   f37ef57 (HEAD -> main) conflict fixed
|\
| * 1181d17 (feature1) write readme.txt in feature1
* | 519067b write readme.txt in main
|/
* 5a30a08 write readme.txt
* 7417b04 (origin/main, origin/HEAD) change file
* 86fcb6b add file

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (main)

11，暂存文件

11-1，暂存工作区修改

通过命令"git stash"，可暂存工作区中的修改

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (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:   readme.txt

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

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (dev)
# 通过命令git stash暂存工作区修改
$ git stash
Saved working directory and index state WIP on dev: f37ef57 conflict fixed

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (dev)
$ git status
On branch dev
nothing to commit, working tree clean

11-2，查询暂存的文件

通过命令"git stash list"， 可查看暂存区的文件

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (dev)
$ git stash list
stash@{0}: WIP on dev: f37ef57 conflict fixed

11-3，恢复暂存的文件到工作区

11-3-1，恢复stash，但不删除暂存区记录

通过命令"git stash apply"(该命令不会删除stash的内容)，可恢复暂存的文件到工作区

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (dev)
$ git stash apply
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:   readme.txt

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

11-3-2，恢复stash，且删除暂存区记录

通过命令"git stash pop", 可恢复暂存的同时并删除stash

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (dev)
$ git stash pop
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:   readme.txt

no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (3bf8691d66bb518bd5cbd78e9f32646f408ad516)

11-3-3，指定stash恢复

当存在多个stash的时候，通过指定stash来恢复

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (dev)
$ git stash list
stash@{0}: WIP on dev: f37ef57 conflict fixed
stash@{1}: WIP on dev: f37ef57 conflict fixed

# 指定"stash@{1}"进行恢复
Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (dev)
$ git stash apply stash@{1}
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:   readme.txt

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

12，推送本地修改到远端

通过命令"git push origin 本地分支名"，可推送本地分支修改到远端参考对应的分支上

Administrator@SDH-20190824RDE MINGW64 /d/python_core_programming_exercises_1 (dev)
# 本地修改推送到远程仓库的dev分支
$ git push origin dev
Enumerating objects: 12, done.
Counting objects: 100% (12/12), done.
Delta compression using up to 12 threads
Compressing objects: 100% (7/7), done.
Writing objects: 100% (10/10), 802 bytes | 267.00 KiB/s, done.
Total 10 (delta 5), reused 0 (delta 0)
remote: Resolving deltas: 100% (5/5), completed with 1 local object.
remote:
remote: Create a pull request for 'dev' on GitHub by visiting:
remote:      https://github.com/yuanlingxiang/python_core_programming_exercises_1/pull/new/dev
remote:
To github.com:yuanlingxiang/python_core_programming_exercises_1.git
 * [new branch]      dev -> dev

13，拉取远端代码

通过命令"git pull"，可拉去远程仓库代码到本地对应的分支上

Administrator@SDH-20190824RDE MINGW64 /d/adf/python_core_programming_exercises_1 (dev)
$ git pull
Already up to date.

14， git标签

14-1，创建标签

14-1-1，不指定commit id创建标签

通过命令"git tag 标签名"， 默认打在最新的commit id

Administrator@SDH-20190824RDE MINGW64 /d/adf/python_core_programming_exercises_1 (dev)
$ git tag V1.0




# 创建带说明的标签

14-1-2，指定commit id创建标签

通过命令"git tag 标签名 commit id"

Administrator@SDH-20190824RDE MINGW64 /d/adf/python_core_programming_exercises_1 (dev)
$ git log --pretty=oneline
f37ef5758633b25f49f93be284537a01c09e1e93 (HEAD -> dev, tag: v0.91181d17, tag: V1.0, origin/dev) conflict fixed
519067b0579e09825f8210eb69abbffcb3970405 write readme.txt in main
1181d17de6df7495cdeac598d21debc60663965d write readme.txt in feature1
5a30a0851cd50053364d1560071bb7181391f126 write readme.txt
7417b048ac57a5101426504751efa8b20c97540a (origin/main, origin/HEAD, main) change file
86fcb6bedd37d81c18a64b58899625ecd9c62666 add file

Administrator@SDH-20190824RDE MINGW64 /d/adf/python_core_programming_exercises_1 (dev)

# 指定commit id创建标签
$ git tag v0.9 5a30a0851cd50053364d1560071bb7181391f126

Administrator@SDH-20190824RDE MINGW64 /d/adf/python_core_programming_exercises_1 (dev)
$ git tag
V1.0
v0.9
v0.91181d17

14-1-3，创建带说明的标签

通过命令"git tag -a 标签名 -m 说明 commit id"， 可创建带说明的标签


Administrator@SDH-20190824RDE MINGW64 /d/adf/python_core_programming_exercises_1 (dev)
$ git tag -a v0.8 -m "tag is V0.8" 86fcb6bedd37d81c18a64b58899625ecd9c62666

Administrator@SDH-20190824RDE MINGW64 /d/adf/python_core_programming_exercises_1 (dev)

14-2，查询标签

14-2-1，查询标签列表

通过命令"git tag"， 可查询所有的标签

Administrator@SDH-20190824RDE MINGW64 /d/adf/python_core_programming_exercises_1 (dev)
$ git tag
V1.0

14-2-2，查询标签详情

通过命令"git show 标签名"， 可查看标签的详情

Administrator@SDH-20190824RDE MINGW64 /d/adf/python_core_programming_exercises_1 (dev)
$ git show v0.9
commit 5a30a0851cd50053364d1560071bb7181391f126 (tag: v0.9)
Author: yuanlingxiang <ylx330328@163.com>
Date:   Tue Jun 20 10:06:21 2023 +0800

    write readme.txt

diff --git a/readme.txt b/readme.txt
index cb53300..6bb6eec 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,2 +1,4 @@
 Git is a distributed version control system
 Git is free software distributed under the GPL
+dfasfaf
+fdafadfadfadf

14-3，操作标签

14-3-1，删除标签

通过命令"git tag -d 标签名"， 可删除标签

Administrator@SDH-20190824RDE MINGW64 /d/adf/python_core_programming_exercises_1 (dev)
$ git tag -d v0.91181d17
Deleted tag 'v0.91181d17' (was f37ef57)

14-3-2，推送单个标签到远端

通过命令"git push orgin 标签名"，可推送标签到远程仓库

Administrator@SDH-20190824RDE MINGW64 /d/adf/python_core_programming_exercises_1 (dev)
$ git push origin v0.8
Enumerating objects: 1, done.
Counting objects: 100% (1/1), done.
Writing objects: 100% (1/1), 162 bytes | 162.00 KiB/s, done.
Total 1 (delta 0), reused 0 (delta 0)
To github.com:yuanlingxiang/python_core_programming_exercises_1.git
 * [new tag]         v0.8 -> v0.8

14-3-3，推送所有的标签到远端

通过命令"git push origin --tags"，可推送所有的标签到远端

Administrator@SDH-20190824RDE MINGW64 /d/adf/python_core_programming_exercises_1 (dev)
$ git push origin --tags
Total 0 (delta 0), reused 0 (delta 0)
To github.com:yuanlingxiang/python_core_programming_exercises_1.git
 * [new tag]         V1.0 -> V1.0
 * [new tag]         v0.9 -> v0.9

14-3-4，删除远端标签

先从本地删除，执行命令"git tag -d 标签名"

Administrator@SDH-20190824RDE MINGW64 /d/adf/python_core_programming_exercises_1 (dev)
$ git tag -d v0.8
Deleted tag 'v0.8' (was cba356a)

再执行命令"git push origin :refs/tags/标签名"，即可删除远程仓库标签

Administrator@SDH-20190824RDE MINGW64 /d/adf/python_core_programming_exercises_1 (dev)
$ git push origin :refs/tags/v0.8
To github.com:yuanlingxiang/python_core_programming_exercises_1.git
 - [deleted]         v0.8