How do I do a pristine checkout with git?

Question

How do I return my working directory to the state it would be in if I made a new clone and checked out the current version?

For subversion I'd do:

$ svn status --no-ignore | awk '$1 == "?" { print $2 }' | xargs rm -r

and for mercurial:

$ hg status --ignored --unknown | awk  ' ( $1 == "?" ) || ( $1 == "I") { print $2 }' | xargs rm -r

So answers in the same line are fine. But something like git checkout --clean -r b4a23 would be better.

Answer 1

(prepare to loose all local, uncommited changes:)

git reset --hard
git clean -dfx .

As mentioned, you can use git stash to temporarily save a reference to your local pending changes on a 'pseudo branch' (ie a stash).

Answer 2

In addition to @sehe's answer , you may want to create an alias to make it easier.

git config --global alias.pristine '!git reset --hard && git clean -dffx'

Then you may just call git pristine .

Answer 3

您可以使用git stash来保存当前修改，然后您可以使用git stash apply来获取您的更改。

Answer 4

Try git reset --hard <revision>

See this page for good examples for the reset command: http://linux.die.net/man/1/git-reset