Git恢复[filename_path]

例如，我需要丢弃我在index.html文件中的最后更改:

git restore /usr/myPC/folder/index.html

我使用源代码树....你可以通过2个简单的步骤恢复所有未提交的更改:

1)只需要重置工作空间文件状态

2)选择所有未升级文件(命令+a)，右键单击并选择删除

就是这么简单:D

我只是偶然发现了一个github库，它可以很容易地撤销git中的一些东西。它叫做ugit

只需输入ugit，它就会为您提供一个选项列表，您可以选择这些选项来撤销git命令

This will unstage all files you might have staged with git add: git reset This will revert all local uncommitted changes (should be executed in repo root): git checkout . You can also revert uncommitted changes only to particular file or directory: git checkout [some_dir|file.txt] Yet another way to revert all uncommitted changes (longer to type, but works from any subdirectory): git reset --hard HEAD This will remove all local untracked files, so only git tracked files remain: git clean -fdx WARNING: -x will also remove all ignored files, including ones specified by .gitignore! You may want to use -n for preview of files to be deleted.

总结一下:执行下面的命令基本上相当于从原始源代码复制一个新的git(但它不会重新下载任何东西，所以更快):

git reset
git checkout .
git clean -fdx

典型的使用是在构建脚本中，当你必须确保你的树是绝对干净的——没有任何修改或本地创建的目标文件或构建工件，并且你想让它工作得非常快，而不是每次都重新克隆整个存储库。

下面定义了一个可重用的Git命令别名来删除任何本地更改，然后可以在将来的任何时候使用它来删除任何未提交的更改:

git config --global alias.remove-changes '!git stash push --include-untracked && git stash drop'

使用别名很简单:

git remove-changes

别名使用git stash push—include-untracked将所有更改推入存储(包括未提交的)，然后使用git stash drop删除新创建的存储条目。

国家从一个承诺过渡到新的承诺

0. last commit,i.e. HEAD commit
1. Working tree changes, file/directory deletion,adding,modification.
2. The changes are staged in index
3. Staged changes are committed

状态转换的动作

0->1: manual file/directory operation
1->2: git add .
2->3: git commit -m "xxx"

检查差异

0->1: git diff
0->2: git diff --cached
0->1, and 0->2: git diff HEAD
last last commit->last commit: git diff HEAD^ HEAD

恢复到上次提交

2->1: git reset
1->0: git checkout .     #only for tracked files/directories(actions include modifying/deleting tracked files/directories)
1->0: git clean -fdx     #only for untracked files/directories(action includes adding new files/directories)
2->1, and 1->0: git reset --hard HEAD

相当于git的克隆，没有重新下载任何东西

git reset && git checkout . && git clean -fdx