I have a git repo, where I replaced a lot of files locally.
git status now shows many many modified files.
Some are \"really modified\", others only differ by li
cd /mnt/c
.cd repos/my-project
git diff -b --numstat \
| egrep $'^0\t0\t' \
| cut -d$'\t' -f3- \
| xargs git checkout HEAD --
Though it seems you were originally looking for a pipe-based solution and you got it from @aristotle-pagaltzis, since it's a bit hard to remember, I think this alternative is worth noting:
git diff -b > gitdiffb
git stash # or git reset --hard if you feel confident
git apply --ignore-space-change gitdiffb
If not just changes to whitespace numbers, but also whitespaces that are completely new or completely removed should be ignored, replace -b
by -w
.
The outcome differs from the pipe-based solution in the removal of whitespace changes even in files that also contain relevant changes. Thus, it's not exactly the way you described it, but for most people coming here via a search engine are probably rather looking for this.
If you're allergic to bash and prefer powershell (formatting for clarity)...
git diff --numstat --ignore-space-change --ignore-all-space
--ignore-blank-lines --ignore-cr-at-eol
--ignore-space-at-eol
| % {($added,$deleted,$path)= $_.Split("`t");
if ("$added$deleted" -eq "00") {$path}
| % { git checkout HEAD $_}
Note that this is a pretty aggressive approach - the git options I've used here will also ignore added/deleted blank lines. Also remember that whitespace and even line-feeds can be semantically meaningful when in the middle of a string so use with that in mind.
It's possible that some of the git options are redundant but I've included them for paranoia's sake. You may wish to peruse the documentation to form your own interpretation.
Here's a slightly terser implementation for cutting and pasting...
git diff --numstat -b -w --ignore-blank-lines --ignore-cr-at-eol --ignore-space-at-eol | % {($a,$d,$p)= $_.Split("`t");if ("$a$d" -eq "00") {$p}| % { git checkout HEAD -- $_}
As was noted elsewhere, it may be advisable to take a copy of your changes before reverting by running git stash
or copying to a backup folder first.
This will do it:
git diff -b --numstat \
| egrep $'^0\t0\t' \
| cut -d$'\t' -f3- \
| xargs git checkout HEAD --
diff -b
.git checkout
against the branch tip.This pipe will do something sensible for each step you leave off, so you can start off with the just the first line and add more to see what happens at each step.
A possibly useful alternative last line:
| git checkout-index --stdin
This would reset the files to their staged contents instead of to their last committed state.
You may also want to use git diff HEAD
on the first line instead, to get a diff of the working copy against the last commit instead of against the index.
Note: if you have filenames with spaces in them, you will first need to add a tr
:
git diff -b --numstat \
| egrep $'^0\t0\t' \
| cut -d$'\t' -f3- \
| tr '\n' '\0' \
Then you must add a -0
/-z
switch to whichever final command you wanted to use:
| xargs -0 git checkout HEAD --
# or
| git checkout-index --stdin -z