Closed schugabe closed 9 years ago
fiendie can you please fix this. .gitattr does some stupid shit. On Nov 26, 2014 9:30 PM, "Johannes" notifications@github.com wrote:
Fixes all wrong line endings and adds a attributes file to convert *.h and
*.c files in the src directory to crlf before each commit
You can merge this Pull Request by running
git pull https://github.com/schugabe/baseflight lineendings2
Or view, comment on, or merge it at:
https://github.com/multiwii/baseflight/pull/210 Commit Summary
- convered line endings
- added attributes file
File Changes
- A src/.gitattributes https://github.com/multiwii/baseflight/pull/210/files#diff-0 (2)
- M src/drv_ak8975.c https://github.com/multiwii/baseflight/pull/210/files#diff-1 (118)
- M src/drv_ak8975.h https://github.com/multiwii/baseflight/pull/210/files#diff-2 (10)
- M src/drv_mpu6500.c https://github.com/multiwii/baseflight/pull/210/files#diff-3 (356)
- M src/drv_mpu6500.h https://github.com/multiwii/baseflight/pull/210/files#diff-4 (6)
- M src/fw_nav.c https://github.com/multiwii/baseflight/pull/210/files#diff-5 (470)
- M src/rxmsp.c https://github.com/multiwii/baseflight/pull/210/files#diff-6 (62)
- M src/sensors.c https://github.com/multiwii/baseflight/pull/210/files#diff-7 (4)
Patch Links:
- https://github.com/multiwii/baseflight/pull/210.patch
- https://github.com/multiwii/baseflight/pull/210.diff
— Reply to this email directly or view it on GitHub https://github.com/multiwii/baseflight/pull/210.
just remove the .gitattribute file and commit just the deletion of the file. If the other files are still marked as uncommitted call git reset --hard
If you don't know what you're doing you should probably leave the text-attribute alone ;)
c and h files are text files so what do you mean?
Fixes all wrong line endings and adds a attributes file to convert .h and .c files in the src directory to crlf before each commit