From 7d34c28674729c94b40a166425bd58403c7784ba Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sat, 27 Apr 2019 21:26:53 +0200 Subject: [PATCH] update .git* files --- .gitattributes | 10 ++++++++++ .gitignore | 5 +++++ 2 files changed, 15 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..f99faebe87 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,10 @@ +# normal text files should contain a simple LF lineend, the following settings +# ensures this even if the user has not set core.autocrlf. +* text=auto + +# binary files should be detected by git, however, to be sure, you can add them here explictly +*.png binary +*.jpg binary +*.gif binary +*.ico binary + diff --git a/.gitignore b/.gitignore index 58f557c389..a19cda8363 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,8 @@ **/*.rs.bk Cargo.lock *.db + +# ignore vi temporaries +*~ +*.swp +*.swo