Skip to content
Permalink
Browse files

gitattributes

  • Loading branch information
mtzguido committed Sep 16, 2019
1 parent 061d435 commit 4391f4061eb292dbd7c7ec4ec32b8347f1707af8
Showing with 10 additions and 4 deletions.
  1. +10 −4 .gitattributes
@@ -3,7 +3,7 @@
*.fst linguist-documentation=false
*.fsti linguist-language=FStar
*.fsti linguist-documentation=false
src/ocaml-output/FStar_*.ml linguist-vendored
/src/ocaml-output/FStar_*.ml linguist-vendored

# Line endings
*.fs* eol=lf
@@ -19,13 +19,19 @@ kremlin_ref eol=lf
/src/tools/* eol=lf
/src/tests/interactive/* eol=lf

# Don't show diffs for generated ocaml-output files
/src/ocaml-output/FStar_*.ml -diff
*.hints -diff
# Do not shows diff nor try to merge for the OCaml snapshot and hint
# files. This just takes the latest one when there's a conflict, and
# does not show diffs in the CLI nor GitHub.
/src/ocaml-output/FStar_*.ml -diff -merge
/src/ocaml-output/FStar_*.ml linguist-generated=true
*.hints -diff -merge
*.hints linguist-generated=true

# Checked modules
*.checked binary
*.checked linguist-generated=true
*.checked.lax binary
*.checked.lax linguist-generated=true

# Batch files
*.bat eol=crlf

0 comments on commit 4391f40

Please sign in to comment.
You can’t perform that action at this time.