Remove a file from the list that will be committed

Question

I have a list of changed files in git repository  There is one file I don t wanna commit for the current moment  Can I do   git commit -a   To commit all files and then somehow remove that file from current commit  After such removing it should still be in the list of uncommited files

User · Answer

git rm --cached will remove it from the commit set   un-adding  it   that sounds like what you want

User · Answer

if you did a git add and you haven t pushed anything yet  you just have to do this to unstage it from your commit   git reset HEAD  lt file gt

User · Answer

Answer   git reset HEAD path to file

User · Answer

Most of these answers circulate around removing a file from the  staging area  pre-commit  but I often find myself looking here after I ve already committed and I want to remove some sensitive information from the commit I just made   An easy to remember trick for all of you git commit --amend folks out there like me is that you can    Delete the accidentally committed file  git add   to add the deletion to the  staging area  git commit --amend to remove the file from the previous commit    You will notice in the commit message that the unwanted file is now missing  Hooray   Commit SHA will have changed  so be careful if you already pushed your changes to the remote

User · Answer

if you have already pushed your commit then  do  git checkout origin  lt remote-branch gt   lt filename gt  git commit --amend   AND If you have not pushed the changes on the server you can use  git reset --soft HEAD 1

User · Answer

You have to reset that file to the original state and commit it again using --amend  This is done easiest using git checkout HEAD    Prepare demo     git init   date  gt file-a   date  gt file-b   git add     git commit -m  Initial commit    date  gt file-a   date  gt file-b   git commit -a -m  the change which should only be file-a    State before     git show --stat commit 4aa38f84e04d40a1cb40a5207ccd1a3cb3a4a317  HEAD - gt  master  Date    Wed Feb 7 17 24 45 2018  0100      the change which should only be file-a   file-a   2  -  file-b   2  -  2 files changed  2 insertions     2 deletions -    Here it comes  restore the previous version    git checkout HEAD  file-b   commit it     git commit --amend file-b  master 9ef8b8b  the change which should only be file-a  Date  Wed Feb 7 17 24 45 2018  0100  1 file changed  1 insertion     1 deletion -    State after     git show --stat commit 9ef8b8bab224c4d117f515fc9537255941b75885  HEAD - gt  master  Date    Wed Feb 7 17 24 45 2018  0100      the change which should only be file-a   file-a   2  -  1 file changed  1 insertion     1 deletion -

User · Answer

Maybe you could also use stash to store temporaly your modifications in a patch file and then reapply it  after a checkout to come back to the old version   This could be related to this other topic   How would I extract a single file  or changes to a file  from a git stash

User · Answer

You want to do this   git add -u git reset HEAD path to file git commit   Be sure and do this from the top level of the repo  add -u adds changes in the current directory  recursively    The key line tells git to reset the version of the given path in the index  the staging area for the commit  to the version from HEAD  the currently checked-out commit    And advance warning of a gotcha for others reading this  add -u stages all modifications  but doesn t add untracked files  This is the same as what commit -a does  If you want to add untracked files too  use add   to recursively add everything

User · Answer

Use stash  like this   git add   git reset Files I Want To Keep git stash --keep-index git commit -a -m  Done   git stash pop   If you accidentally commit a file  and want to rewrite your git history  use   git reset HEAD 1 path to file git commit -a -m  rollback  git rebase -i HEAD 2   and squash to the two leading commits  You can write a helper script to do either of these if you have a known set of files you prefer not to automatically commit

[git] Remove a file from the list that will be committed

Examples related to git

Examples related to file

Examples related to commit