Git刪除了文件。 我如何獲得干凈的工作目錄？

Question

所以我在一個單獨的haml分支中重構我對haml的看法。 我不小心刪除了我的新haml視圖而不是舊的erb視圖。

$ git rm app/views/projects/edit.html.haml app/views/projects/new.html.haml .....

所以我做了一次重置

$ git reset HEAD app/views/projects/edit.html.haml app/views/projects/new.html.haml .....
Unstaged changes after reset:
D   app/views/projects/_form.html.erb
D   app/views/projects/edit.html.erb
D   app/views/projects/edit.html.haml
.
.
.  

git status顯示

$ git status
# On branch haml
# Changes not staged for commit:
#   (use "git add/rm <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#   deleted:    app/views/projects/_form.html.erb
#   deleted:    app/views/projects/edit.html.erb
#   deleted:    app/views/projects/edit.html.haml
.
.
.

我從哪里開始才能保留haml文件並獲得干凈的工作目錄？

我確定它很簡單，但寧可要求而不是讓它變得更糟。 謝謝

Answer 1

你需要reset --hard ，這將更新工作目錄。