在项目的某次修改中,可能包括添加、删除、更新了一些文件,结果并不好。这时想要丢弃这些修改。
这些变动包括2中类型:
- tracked file(s)
- untracked file(s)
使用git clean
来清理untracked files
执行git 命令:
$ git clean -df
清理tracked files
执行这些命令:
$ git checkout . #本地所有修改的。没有的提交的,都返回到原来的状态
$ git stash #把所有没有提交的修改暂存到stash里面。可用git stash pop回复。
$ git reset --hard HASH #返回到某个节点,不保留修改。
$ git reset --soft HASH #返回到某个节点。保留修改
help information
NAME
- git-clean - Remove untracked files from the working tree
SYNOPSIS
- git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [–]
…
DESCRIPTION
Cleans the working tree by recursively removing files that are not under version control, starting from the current directory.
Normally, only files unknown to Git are removed, but if the -x option is specified, ignored files are also removed. This can, for example, be useful to remove all build products.
If any optional
OPTIONS
-d
Remove untracked directories in addition to untracked files. If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory.
-f
–force
If the Git configuration variable clean.requireForce is not set to false, git clean will refuse to delete files or directories unless given -f, -n or -i. Git will refuse to delete directories with .git sub directory or file unless a second -f is given.
-i
–interactive
Show what would be done and clean files interactively. See “Interactive mode” for details.
-n
–dry-run
Don’t actually remove anything, just show what would be done.
-q
–quiet
Be quiet, only report errors, but not the files that are successfully removed.
-e
–exclude=
In addition to those found in .gitignore (per directory) and $GIT_DIR/info/exclude, also consider these patterns to be in the set of the ignore rules in effect.
-x
Don’t use the standard ignore rules read from .gitignore (per directory) and $GIT_DIR/info/exclude, but do still use the ignore rules given with -e options. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with git reset) to create a pristine working directory to test a clean build.
-X
Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files.