Ignore text=auto in .gitattributes file

Question

I checked out a branch foo, and now I want to switch to branch bar.

error: Your local changes to the following files would be overwritten by checkout:
<300 files follow>

Someone has a .gitattributes file on foo that includes

text=auto

All of the "changes" are newline changes.

I could remove the file, switch branches, and then add it back.

rm .gitattributes
git checkout bar
git checkout .gitattributes

Is this the best (fastest/least typing) way?

EDIT: To be clear, I just want to switch branches. I'm only reading the repo. I don't want to change anything other than the working tree. But I can't.

Stash and then apply the changes with -Xignore-eol or whatever it is? — ta.speot.is, Jan 26 '15 at 10:23

score 1 · Answer 1 · edited May 23 '17 at 12:20

1

I just want to switch branches. I'm only reading the repo.

Then removing the .gitattributes is indeed one possible solution, provided you don't try to checkout again foo once on bar (or that .gitattributes would appear again)

Another option would be to simply clone the repo directly at the bar branch, creating a separate working tree.

edited May 23 '17 at 12:20

Community

1
1

answered Jan 26 '15 at 09:08

VonC

1,262,500
529
4,410
5,250

@PaulDraper Ok, I have rewritten the answer accordingly. – VonC Jan 26 '15 at 11:34

Ignore text=auto in .gitattributes file

1 Answers1