Git - Windows AND linux line-endings

linux windows git ubuntu line-endings
Basaa picture Basaa · Jan 5, 2016 · Viewed 8.3k times · Source

My main OS is windows 10.

I have an Ubuntu 14.04 box running in Vagrant that I develop my applications on. The box is running SMB which gives me root file access to the Ubuntu server.

On the Ubuntu server I have my application files in a GIT repo with a gitlab server as the origin.

I run SourceTree on my windows machine that connects to the ubuntu GIT repo through the SMB share (so I assume it uses my Windows GIT installation).

Git status on the ubuntu machine gives no changes.

Git status on Windows and SourceTree indicate that all the files have changed (because of the line endings).

What settings on which OS should I use in order to be able to use the same local repo on both Windows and Linux?

Answer

bigOther picture bigOther · Jan 5, 2016

On Windows:

$ git config --global core.autocrlf true

On Linux:

$ git config --global core.autocrlf input

Read more about Dealing with line endings

Related questions

Git status ignore line endings / identical files / windows & linux environment / dropbox / mled

How do I make git status ignore line ending differences? Background info: I use randomly Windows and Linux to work on the project. The project is in Dropbox. I found a lot about how do make git diff ignore line …

Read More
Git on Windows: What do the crlf settings mean?

I don't understand the complexities related to CrLf settings in git: core.autocrlf, core.safecrlf I'm developing a cross-platform project in a team and would like both Windows and Linux developers to be able to work together without git marking …

Read More
Concurrency in a GIT repo on a network shared folder

I want to have a bare git repository stored on a (windows) network share. I use linux, and have the said network share mounted with CIFS. My coleague uses windows xp, and has the network share automounted (from ActiveDirectory, somehow) …

Read More