diff options
| author | David Allsopp <david.allsopp@metastack.com> | 2015-12-12 13:33:31 +0000 |
|---|---|---|
| committer | David Allsopp <david.allsopp@metastack.com> | 2015-12-12 14:38:11 +0000 |
| commit | d8b7a4f48e81f11dc4fa95cfbfcb4d2eb1161013 (patch) | |
| tree | e96e8d12c0d0a9bbc897623042b35d354b55915b /.gitattributes | |
| parent | 655f2f31087b2dfca811a32d91fa43264f1cf680 (diff) | |
| download | ocaml-d8b7a4f48e81f11dc4fa95cfbfcb4d2eb1161013.tar.gz | |
Update .gitattributes for improved Windows support
Explicitly state which files should always be checked out with LF
endings (shell scripts, especially).
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index cd99925e2b..e0c8134706 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,13 @@ +# Default behaviour, for if core.autocrlf isn't set +* text=auto + +# Binary files boot/ocamlc binary boot/ocamllex binary boot/ocamldep binary +*.gif +*.png +*.tfm .gitattributes ocaml-typo=missing-header .gitignore ocaml-typo=missing-header @@ -31,3 +38,44 @@ ocamlbuild/TODO ocaml-typo=missing-header ocamldoc/Changes.txt ocaml-typo=missing-header ocamldoc/ocamldoc.sty ocaml-typo=missing-header + +# Line-ending specifications, for Windows interoperability +*.sh text eol=lf +*.sh.in text eol=lf +*.awk text eol=lf + +configure text eol=lf +config/auto-aux/hasgot text eol=lf +config/auto-aux/hasgot2 text eol=lf +config/auto-aux/runtest text eol=lf +config/auto-aux/searchpath text eol=lf +config/auto-aux/solaris-ld text eol=lf +config/auto-aux/tryassemble text eol=lf +config/auto-aux/trycompile text eol=lf +config/gnu/config.guess text eol=lf +config/gnu/config.sub text eol=lf +ocamldoc/remove_DEBUG text eol=lf +stdlib/Compflags text eol=lf +stdlib/sharpbang text eol=lf +tools/check-typo text eol=lf +tools/ci-build text eol=lf +tools/cleanup-header text eol=lf +tools/gdb-macros text eol=lf +tools/magic text eol=lf +tools/make-opcodes text eol=lf +tools/make-package-macosx text eol=lf +tools/ocaml-objcopy-macosx text eol=lf +tools/ocamlmktop.tpl text eol=lf +tools/ocamlsize text eol=lf + +# These two are cat scripts, so may not actually require this +config/auto-aux/sharpbang text eol=lf +config/auto-aux/sharpbang2 text eol=lf + +# Similarly, these are all Perl scripts, so may not actually require this +manual/tools/caml-tex text eol=lf +manual/tools/format-intf text eol=lf +manual/tools/htmlcut text eol=lf +manual/tools/htmltbl text eol=lf +manual/tools/htmlthread text eol=lf +manual/tools/texexpand text eol=lf |