Git undo changes in some files

Question

While coding I added print statements into some files to keep track of what was going on   When I am done  is it possible to revert changes in some files  but commit the file I actually worked on    Say I added print in file A  but I modified file B  B is what I want to commit and A  I want to be set back to its old state

User · Answer

git add B   Add it to the index git reset A   Remove it from the index git commit   Commit the index

User · Answer

There are three basic ways to do this depending on what you have done with the changes to the file A  If you have not yet added the changes to the index or committed them  then you just want to use the checkout command - this will change the state of the working copy to match the repository   git checkout A   If you added it to the index already  use reset   git reset A   If you had committed it  then you use the revert command     the -n means  do not commit the revert yet git revert -n  lt sha1 gt    now make sure we are just going to commit the revert to A git reset B git commit   If on the other hand  you had committed it  but the commit involved rather a lot of files that you do not also want to revert  then the above method might involve a lot of  reset B  commands  In this case  you might like to use this method     revert  but do not commit yet git revert -n  lt sha1 gt    clean all the changes from the index git reset   now just add A git add A git commit   Another method again  requires the use of the rebase -i command  This one can be useful if you have more than one commit to edit     use rebase -i to cherry pick the commit you want to edit   specify the sha1 of the commit before the one you want to edit   you get an editor with a file and a bunch of lines starting with  pick    change the one s  you want to edit to  edit  and then save the file git rebase -i  lt sha1 gt    now you enter a loop  for each commit you set as  edit   you get to basically redo that commit from scratch   assume we just picked the one commit with the erroneous A commit git reset A git commit --amend   go back to the start of the loop git rebase --continue

User · Answer

Why can t you simply mark what changes you want to have in a commit using  git add  lt file gt    or even  git add --interactive   or  git gui  which has option for interactive comitting   and then use  git commit  instead of  git commit -a    In your situation  for your example  it would be   prompt gt  git add B prompt gt  git commit   Only changes to file B would be comitted  and file A would be left  dirty   i e  with those print statements in the working area version  When you want to remove those print statements  it would be enought to use  prompt gt  git reset A   or  prompt gt  git checkout HEAD -- A   to revert to comitted version  version from HEAD  i e   git show HEAD A  version

User · Answer

Source   http   git-scm com book en Git-Basics-Undoing-Things  git checkout -- modifiedfile java     1   git status   you will see the modified file  2  git checkout -- modifiedfile java  3  git status

User · Answer

man git-checkout  git checkout A

User · Answer

Yes    git commit FILE   will commit just FILE  Then you can use  git reset --hard   to undo local changes in other files   There may be other ways too that I don t know about     edit  or  as NicDumZ said  git-checkout just the files you want to undo the changes on  the best solution depends on wether there are more files to commit or more files to undo  -

[git] Git undo changes in some files

Examples related to git

Examples related to file

Examples related to version-control

Examples related to undo

Examples related to revert