Git：如何取消暂存文件更改（新提交）

Question

mohamed@mohamed:~/Projects/skyrocket$ git status 
On branch dev/SMMWEB-36
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:   config/puppet/modules/apt (new commits)
    modified:   config/puppet/modules/augeas (new commits)
    modified:   config/puppet/modules/concat (new commits)
    modified:   config/puppet/modules/elasticsearch (new commits)
    modified:   config/puppet/modules/file_concat (new commits)
    modified:   config/puppet/modules/git (new commits)
    modified:   config/puppet/modules/php (new commits)
    modified:   config/puppet/modules/postgresql (new commits)
    modified:   config/puppet/modules/redis (new commits)
    modified:   config/puppet/modules/stdlib (new commits)
    modified:   config/puppet/modules/vcsrepo (new commits)

Untracked files:
  (use "git add <file>..." to include in what will be committed)

    .idea/copyright/
    config/puppet/modules/blackfire/
    config/puppet/modules/inifile/
    dump.rdb
    keys.dev.pub
    keys.tags.pub

no changes added to commit (use "git add" and/or "git commit -a")

I do not know what (new commits) does mean? I do not want to commit these files. I tried to do

$ git checkout -- . 

What if i put config/puppet/* to gitignore file then updated the cache as following

$ git rm --cached -r . 

will this delete these files from repo. after pushing or merging with other branches?

Answer 1

git reset is the command to unstage file from git.

After unstaging the file, you can confirm it by git status command as well.

Answer 2

If the directories under config/puppet/modules/ are submodules, try

$ git submodule update

which worked for me. See https://stackoverflow.com/a/14422494/5794048

Answer 3

If you want to save the modification for later use, just stash them with

git add . && git stash save "info for the modification" git add . && git stash save "info for the modification" .

If you want to drop the modification, just do

git add . && git reset --hard HEAD

---

Attach: to show what you have stashed with git stash list , to apply the stash with git stash pop

Answer 4

使用git reset取消git reset文件！

Answer 5

使用“git reset”您可以撤消所有添加或使用 git reset file_name 您可以撤消选择的添加

Answer 6

我们可以运行命令git reset --hard