在 git add 之前，放弃对文件的所有修改
就算你用 rm 删除了也无所谓，照样还原回来。（如果是没有用 git 进行跟踪的文件，可不要轻易这么尝试哟！）
git checkout --
当你对一个文件进行了修改，还没有 add 进暂存区，你想要放弃所有的修改，将文件恢复到没有修改之前的样子，这时候可以使用 git checkout -- ，这条命令会将文件恢复到上一次 commit 的时候这个文件的样子。
[root@master GitTest]# vim hello.txt
[root@master GitTest]# git status
On branch master
Your branch is up to date with 'origin/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: hello.txt
no changes added to commit (use "git add" and/or "git commit -a")
[root@master GitTest]# git checkout -- hello.txt
[root@master GitTest]# git status
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
git restore (推荐使用)
貌似新版本的 git restore 和 git checkout -- 差不多，以后可能用 git restore 更多一些了，毕竟见文知意，而且命令还短。
[root@master GitTest]# vim hello.txt
[root@master GitTest]# git status
On branch master
Your branch is up to date with 'origin/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: hello.txt
no changes added to commit (use "git add" and/or "git commit -a")
[root@master GitTest]# git restore hello.txt
[root@master GitTest]# git status
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
将 git add 的文件变成 git add 之前的状态
git restore --staged <file>
[looking@master GitTest]$ vim b.txt
[looking@master GitTest]$ git add b.txt
[looking@master GitTest]$ git status
On branch master
Your branch is up to date with 'origin/master'.
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
modified: b.txt
[looking@master GitTest]$ git restore --staged b.txt
[looking@master GitTest]$ git status
On branch master
Your branch is up to date with 'origin/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: b.txt
no changes added to commit (use "git add" and/or "git commit -a")
git reset HEAD <file>
Administrator@PC-20200713AJJH MINGW64 /d/MyProject/Python/GitTest (master)
$ vi myGit.txt # 添加新行 hello world
Administrator@PC-20200713AJJH MINGW64 /d/MyProject/Python/GitTest (master)
$ git add myGit.txt
Administrator@PC-20200713AJJH MINGW64 /d/MyProject/Python/GitTest (master)
$ git status
On branch master
Your branch is ahead of 'origin/master' by 2 commits.
(use "git push" to publish your local commits)
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: myGit.txt
Administrator@PC-20200713AJJH MINGW64 /d/MyProject/Python/GitTest (master)
$ git reset HEAD myGit.txt
Unstaged changes after reset:
M myGit.txt
Administrator@PC-20200713AJJH MINGW64 /d/MyProject/Python/GitTest (master)
$ git status
On branch master
Your branch is ahead of 'origin/master' by 2 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: myGit.txt
no changes added to commit (use "git add" and/or "git commit -a")
将 git commit 的文件变为 git add 之前的状态
git restore -s HEAD~1
执行以后，git commit 的 log 信息并没有丢失，你可以重新修改文件，然后 git add ，再 git commit --amend 对修改重新进行提交。
[looking@master GitTest]$ git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
[looking@master GitTest]$ git restore -s HEAD~1 hello.txt
[looking@master GitTest]$ git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(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 restore <file>..." to discard changes in working directory)
modified: hello.txt
no changes added to commit (use "git add" and/or "git commit -a")重新填写 git commit 信息
git commit --amend
有时候我们在提交完成之后才发现有几个文件没有提交，或者发现提交信息填写错了，这时候可以使用 git commit --amend 尝试重新进行提交。
$ git commit --amend
- mv test.txt to test directory
+ mv test.txt to test dir
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Date: Wed Jul 29 22:28:31 2020 +0800
#
# On branch master
# Your branch is ahead of 'origin/master' by 2 commits.
# (use "git push" to publish your local commits)
#
# Changes to be committed:
# renamed: test.txt -> test/test.txt
#
$ git commit --amend
[master db41223] mv test.txt to test dir
Date: Wed Jul 29 22:28:31 2020 +0800
1 file changed, 1 insertion(+)
rename test.txt => test/test.txt (71%)
不想让 git 继续跟踪某个文件
git rm --cached
如果你只是想从暂存区删除文件，但是工作区的文件保持不变（将文件保存在磁盘），也就是说将文件保存在磁盘但是不想让 Git 进行跟踪，使用如下命令即可 git rm --cached ：
Administrator@PC-20200713AJJH MINGW64 /d/MyProject/Python/GitTest (master)
$ vi test.txt # 新行添加 hello world
git
Administrator@PC-20200713AJJH MINGW64 /d/MyProject/Python/GitTest (master)
$ git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(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: test.txt
no changes added to commit (use "git add" and/or "git commit -a")
Administrator@PC-20200713AJJH MINGW64 /d/MyProject/Python/GitTest (master)
$ git rm --cached test.txt
rm 'test.txt'
Administrator@PC-20200713AJJH MINGW64 /d/MyProject/Python/GitTest (master)
$ git status # 显示文件 test.txt 为 Untracked files
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
deleted: test.txt
Untracked files:
(use "git add <file>..." to include in what will be committed)
test.txt
将 git 仓库变成普通目录
rm -rf .git
这个要稍微简单一些了，毕竟 git 能进行版本控制最主要的就是因为这个隐藏的 .git 目录了，删了就可以了（请谨慎操作）。
[root@master GitTest]# git status
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
[root@master GitTest]# rm -rf .git
[root@master GitTest]# git status
fatal: not a git repository (or any of the parent directories): .git
撤销最近的 commit，但是不撤销对应 commit 所做的文件修改
git reset HEAD~
注：使用此命令，你原来提交的代码都在，不会被撤销，也即只会撤销 commit 记录（不对文件内容进行修改）。
[root@master GitTest]# git status
# On branch master
nothing to commit, working directory clean
[root@master GitTest]# vim b.txt # 删除了文件最后一行
# 下面 commit 失败，因为修改的文件还没添加到暂存区
[root@master GitTest]# git commit -m "delete last line in b.txt"
# On branch master
# 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: b.txt
#
no changes added to commit (use "git add" and/or "git commit -a")
------------------------------------------------------------
[root@master GitTest]# git add b.txt
[root@master GitTest]# git commit -m "delete last line in b.txt"
[master 131c2e9] delete last line in b.txt
1 file changed, 1 deletion(-)
[root@master GitTest]# git log
commit 131c2e9e676726168a87db678c17e8ec404b8c4e
Author: looking <looking@qq.com>
Date: Sat Aug 8 01:35:09 2020 +0800
delete last line in b.txt
commit f3b4d4abd65a59c8a03df6caccf28f33422b4614
Author: looking <looking@qq.com>
Date: Tue Aug 4 21:42:27 2020 +0800
This is a combination of 2 commits.
add hello in new line of looking.txt
add world in new line of looking.txt
------------------------------------------------------------
# 注意啦，放大招啦。
[root@master GitTest]# git reset HEAD~
Unstaged changes after reset:
M b.txt
# 这个时候回到了 add 和 commit 提交之前，但是在文件 b.txt 修改之后的那个状态
[root@master GitTest]# git status
# On branch master
# 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: b.txt
#
no changes added to commit (use "git add" and/or "git commit -a")
------------------------------------------------------------
# 因为 commit 被撤销了，所以我们再重新提交一次
[root@master GitTest]# git add b.txt
[root@master GitTest]# git commit -m "delete last line in b.txt"
[master 33796e9] delete last line in b.txt
1 file changed, 1 deletion(-)
[root@master GitTest]# git log
commit 33796e9844af4b6e1ee23c2d98ec5be4c5fef3e6
Author: looking <looking@qq.com>
Date: Sat Aug 8 01:44:27 2020 +0800
delete last line in b.txt
commit f3b4d4abd65a59c8a03df6caccf28f33422b4614
Author: looking <looking@qq.com>
Date: Tue Aug 4 21:42:27 2020 +0800
This is a combination of 2 commits.
add hello in new line of looking.txt
add world in new line of looking.txt
commit cd3e33625578c3aaf6f19b69c878559a1dcf552a
Merge: 640fd3c 3fceb8a
[root@master GitTest]#
撤销最近的 commit，同时撤销对应 commit 所作的文件修改
git reset --hard HEAD^1
注：使用之后，你最新的 commit 命令下修改的内容将完全被撤销，最近一次的 commit 记录也没了。
[root@master GitTest]# git add b.txt
[root@master GitTest]# git commit -m "modify file b.txt"
[master be7abc1] modify file b.txt
1 file changed, 2 deletions(-)
[root@master GitTest]# git log
commit be7abc12a1a94e9390bd6c7f4bc747f9bbe86ab9
Author: looking <looking@qq.com>
Date: Sat Aug 8 02:01:32 2020 +0800
modify file b.txt
commit f3b4d4abd65a59c8a03df6caccf28f33422b4614
Author: looking <looking@qq.com>
Date: Tue Aug 4 21:42:27 2020 +0800
This is a combination of 2 commits.
add hello in new line of looking.txt
add world in new line of looking.txt
------------------------------------------------------------
[root@master GitTest]# cat b.txt
hahahahaha
hohohohoho
rebase test
add one line in b.txt by user B
add one line in b.txt by user B again
------------------------------------------------------------
[root@master GitTest]# git reset --hard HEAD^1
HEAD is now at f3b4d4a This is a combination of 2 commits.
------------------------------------------------------------
# 注意看，git reset --hard HEAD^1 执行前后， b.txt 文件内容发生变化了哟！
# git log 的最近一次 commit 没有了！
------------------------------------------------------------
[root@master GitTest]# cat b.txt
hahahahaha
hohohohoho
hehehehehe
rebase test
add one line in b.txt by user B
add one line in b.txt by user B again
hello world
------------------------------------------------------------
[root@master GitTest]# git log
commit f3b4d4abd65a59c8a03df6caccf28f33422b4614
Author: looking <looking@qq.com>
Date: Tue Aug 4 21:42:27 2020 +0800
This is a combination of 2 commits.
add hello in new line of looking.txt
add world in new line of looking.txt
回滚之前某个 commit 提交的内容
git revert <commit-id>
git revert 是用于“反做”某一个版本，以达到撤销该版本的修改的目的。 git reset 的作用是修改HEAD的位置，且那个版本之后提交的版本都会丢失。
git revert 可以回滚某个 commit 对应的修改，所以在这点上面 revert 和 reset 是不一样的。
root@master ~/GitTest# vim hello.txt
root@master ~/GitTest# git add hello.txt
root@master ~/GitTest# git commit -m "add hello in hello.txt"
root@master ~/GitTest# git show
commit 72bfd90b8194b1d3537fc62a22d6776d32ae5b4b (HEAD -> master)
Author: looking <looking@qq.com>
Date: Mon Jun 6 17:11:10 2022 +0800
add hello in hello.txt
diff --git a/hello.txt b/hello.txt
index 83585f1..25f7272 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,3 +1,4 @@
+hello
nice
hello world
hello world. I am Lookingrevert 是新建一个 commit 来回滚之前 commit-id 的操作，可以看到 git revert <commit-id> 执行的操作是 commit-id 操作的逆操作，也就是 commit-id 做的动作，它都会反向操作一遍。
root@master ~/GitTest# git revert 72bfd90b8194b1d3537fc62a22d6776d32ae5b4b
[master 780b3e0] Revert "add hello in hello.txt"
1 file changed, 1 deletion(-)
root@master ~/GitTest# git show
commit 780b3e0044b10aa62a6459a44d4b657da76a501d (HEAD -> master)
Author: looking <looking@qq.com>
Date: Mon Jun 6 17:26:12 2022 +0800
Revert "add hello in hello.txt"
This reverts commit 72bfd90b8194b1d3537fc62a22d6776d32ae5b4b.
diff --git a/hello.txt b/hello.txt
index 25f7272..83585f1 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,4 +1,3 @@
-hello
nice
hello world
hello world. I am Looking
reset 的话，则 reset 对应 commit-id 之后的修改就丢失了（这也是 reset 比 revert 更危险的原因之一）。
root@master ~/GitTest# git reset --hard 1912baa1b9457add393f48c41ffd35957aa8b569
HEAD is now at 1912baa deal merge conflict in hello.txt
当然，回滚也是可能会造成冲突的，稍微注意一下就行。比如有人在你之前 commit-id 修改的地方又重新做了新的修改，你 revert 这个 commit-id 的话肯定就不可避免要 conflict 了。
修改倒数二个 commit 相关内容
git rebase -i HEAD~2 和 git rebase --continue。git 修改倒数二个 commit_TomorrowAndTuture的博客-CSDN博客
git rebase -i HEAD~2
git rebase -i HEAD~2 以后，git 会自动给你切换到下面这个界面，你将你需要修改的那个 commit 前边的 pick 修改为 edit。
[root@master GitTest]# git rebase -i HEAD~2
edit 3d87922 nice to meet you
pick df5f952 nice to meet you too
# Rebase 3f20612..df5f952 onto 3f20612 (2 commands)
#
# Commands:
# p, pick <commit> = use commit
# r, reword <commit> = use commit, but edit the commit message
# e, edit <commit> = use commit, but stop for amending
# s, squash <commit> = use commit, but meld into previous commit
# f, fixup <commit> = like "squash", but discard this commit's log message
# x, exec <command> = run command (the rest of the line) using shell
# b, break = stop here (continue rebase later with 'git rebase --continue')
# d, drop <commit> = remove commit
# l, label <label> = label current HEAD with a name
# t, reset <label> = reset HEAD to a label
# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
# . create a merge commit using the original merge commit's
# . message (or the oneline, if no original merge commit was
# . specified). Use -c <commit> to reword the commit message.然后保存退出，而且 git 也已经提醒你版本已经 stopped 在这个 commit 节点了，你可以开始你的表演（修改）了：
[root@master GitTest]# git rebase -i HEAD~2
Stopped at 3d87922... nice to meet you
You can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
假如我想把原来插入的 nice to meet you 修改为 nice。用 vim 修改后用 git commit --amend 重新提交 commit。
[root@master GitTest]# vim hello.txt
[root@master GitTest]# git add hello.txt
[root@master GitTest]# git commit --amend
nice
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Date: Mon Aug 31 21:16:51 2020 +0800
#
# interactive rebase in progress; onto 3f20612
[detached HEAD bcbfd91] nice
Date: Mon Aug 31 21:16:51 2020 +0800
1 file changed, 1 insertion(+)
git rebase --continue
然后继续 git rebase --continue 就好了（如果没有冲突，直接 git rebase --continue 也是极好的）。
[root@master GitTest]# git add hello.txt
[root@master GitTest]# git rebase --continue
[detached HEAD 72017cd] nice to meet you too
1 file changed, 1 insertion(+)
Successfully rebased and updated refs/heads/master.
git rebase --abort
这个是你在 git rebase 过程当中的后悔药，如果你在 rebase 的任何过程中想退出 rebase 过程，直接执行 git rebase --abort 就直接退出回到 rebase 之前的状态啦。
将代码切换回之前的某个稳定版本（不乐意的话还可以切换回来）
git checkout 和 git checkout master。
[root@master GitTest]# git checkout 3f2061298d921378da14f4003753f1f277e67243
Note: switching to '3f2061298d921378da14f4003753f1f277e67243'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:
git switch -c <new-branch-name>
Or undo this operation with:
git switch -
Turn off this advice by setting config variable advice.detachedHead to false
HEAD is now at 3f20612 I am Looking
[root@master GitTest]# git checkout master
Previous HEAD position was 3f20612 I am Looking
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
恢复到之前某个稳定的版本（master 也是一并切换过去了的哟）
git reset --hard commitId（谨慎使用）
如果想恢复到之前某个提交的版本，且那个版本之后提交的版本我们都不要了，就可以用这种方法（这个和 git checkout最大的不同在于它把你的 master 也切换过去了，你要再想用 git checkout master 可就回不去 origin/master 了哟，如果你还记得 commitId 的话，还是可以切换回去的）。
master：本地主分支。origin/master：远端主分支。
[root@master GitTest]# git reset --hard 3f2061298d921378da14f4003753f1f277e67243
HEAD is now at 3f20612 I am Looking
[root@master GitTest]# git checkout master
Already on 'master'
Your branch is behind 'origin/master' by 12 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
[root@master GitTest]# git reset --hard 1912baa1b9457add393f48c41ffd35957aa8b569
HEAD is now at 1912baa deal merge conflict in hello.txt
[root@master GitTest]# git checkout master
Already on 'master'
Your branch is up to date with 'origin/master'.丢弃本地所有未提交的修改
git stash 同时 git stash clear
针对本地所有修改了但是还没进行 git commit 提交的部分，即使已经使用了 git add，也仍然可以丢弃。
[root@master GitTest]# git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
deleted: b.txt
modified: hello.txt
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: c.txt
[root@master GitTest]# git stash
Saved working directory and index state WIP on master: 2017dee add newline in c.txt
[root@master GitTest]# git stash clear
[root@master GitTest]# git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
git stash 结合 git stash pop 还可以适用于快速对比程序修改前后的运行差异，而且可以在现有修改的基础上继续修改。
丢弃本地所有修改，强制拉取覆盖本地
git fetch --all ; git reset --hard origin/master
如果你想以远程仓库的版本内容为准，丢弃本地所有修改（当然，本地的 untracked file 不属于版本控制的范围，不会受到这条命令的影响），但是又不想删除本地仓库以后再次 git clone，那么就按下边这么做吧。
git fetch --all && git reset --hard origin/master如果你不是在 master 主分支上，也不是想拉取主分支的代码，就用 HEAD 就可以了，HEAD 会指向你当前所在的分支
git fetch --all ; git reset --hard HEAD
丢弃远端所有修改，强制推送覆盖远端
git push -f <repo> <branch>
这个好像没啥多说的，只要你考虑好了，就强制推送就好了啦。默认是 git push -f origin master。
删除本地仓库，重新克隆（终极解决方案）
rm -rf GitTest
git clone https://github.com/2392863668/GitTest
如果你想以远程仓库的版本内容为准，丢弃本地所有修改（包括仓库里边 untracked file 文件的改动），那就重新克隆一个吧。
[root@master workspace]# rm -rf GitTest
[root@master workspace]# git clone https://github.com/2392863668/GitTest
Cloning into 'GitTest'...
remote: Enumerating objects: 26, done.
remote: Counting objects: 100% (26/26), done.
remote: Compressing objects: 100% (19/19), done.
remote: Total 247 (delta 11), reused 15 (delta 5), pack-reused 221
Receiving objects: 100% (247/247), 1.27 MiB | 869.00 KiB/s, done.
Resolving deltas: 100% (95/95), done.
版权声明：本文为TomorrowAndTuture原创文章，遵循CC 4.0 BY-SA版权协议，转载请附上原文出处链接和本声明。