Change the CRLF strategie: All (nearly all) files have LF in the repo, and CRLF in the working tree. When we started, all files had been commited "as is". Now it is more and more disturbing that Git shows "^M" in git diff when a line was added or chenged. To avoid this, store all files in the repo with LF. To normalzie existing repos for a crate, run: Step 1) (unless you have done that already) git remote add tc_generic_structure https://bitbucket.org/europeanspallationsource/tc_generic_structure.git Step 2) git fetch tc_generic_structure Step 3) (master below may be integration) git merge tc_generic_structure/master -X renormalize
7 lines
142 B
Plaintext
7 lines
142 B
Plaintext
# end of line conversion CLRF -- LF
|
|
# Default is auto
|
|
* text=auto
|
|
#
|
|
# Shell scripts must be line feed
|
|
*.sh text eol=lf
|