Undo line ending changes in Git

Question

My question is similar to Git - unchange line endings in already committed file, though the accepted answer seems to be mostly musings, and not helpful in my situation.

I have several fairly large commits. Between my editor and my git configuration at the time, I committed many line ending changes

For example, I changed on line in a file, but my commit changes line endings for the thousands of other lines in the file.

I have not pushed the commits. How to I remove the line ending changes before I push?

I tried

git rebase [last_good_commit]

but it just said

current branch *** is up to date.

possible duplicate of [How to undo the last Git commit?](http://stackoverflow.com/questions/927358/how-to-undo-the-last-git-commit) — Mathew, Jan 07 '14 at 17:31
@MatW, not a duplicate. I have several commits that I want to change. — Paul Draper, Jan 07 '14 at 17:33
Ahh, sorry. Then @poke's suggestion is the one I would go for. — Mathew, Jan 07 '14 at 17:40
How big were your commits? Would your changes be conducive to simply doing a hard reset and recreating your work? — mjswensen, Jan 07 '14 at 17:47

score 15 · Answer 1 · answered Jan 09 '14 at 07:55

15

Simply force a rebase for the commits you haven’t pushed yet, and tell it to apply whitespace fixes to the patches:

git rebase --whitespace=fix -f <last_good_commit>

Rebase internally works via applying patches, and conveniently git-apply supports fixing the whitespace with the --whitespace option.

answered Jan 09 '14 at 07:55

mockinterface

Is it possible to fix just the line endings instead of all whitespace changes? – A Jar of Clay Mar 17 '21 at 12:24

1 Answers1