Menu
Seems like this should be super-simple but looking around for a simple (or half-way straightforward) solution seems impossible:
Say I add a bunch of files to a Git project. "git status" now says:
# On branch master
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# Classes/FileA.h
# Classes/FileA.m
# Classes/FileB.h
# Classes/FileB.m
nothing added to commit but untracked files present (use "git add" to track)
I then decide I want to discard these files and get back to my original status within the project. Do I have to delete each file before proceeding?!!
I've tried:
git checkout master
which gives "Already on 'master'" and
git reset --hard HEAD
but my added files are still there for both methods.
I've been through the entire Git tutorial (http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html) plus various man pages.
Why is this so difficult to do?!!
566
For all unstaged files in current working directory use: git restore . That together with git switch replaces the overloaded git checkout (see here), and thus removes the argument disambiguation. If a file has both staged and unstaged changes, only the unstaged changes shown in git diff are reverted.
git reset --hard resets your index and reverts the tracked files back to state as they are in HEAD. It leaves untracked files alone.
There are two Git commands a developer must use in order to discard all local changes in Git, remove all uncommited changes and revert their Git working tree back to the state it was in when the last commit took place. The commands to discard all local changes in Git are: git reset –hard. git clean -fxd.
git clean
should do the trick. By default, this requires the -f flag to really do anything.
91
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
