From d453b5014eaef57e09532fe7063adb1eddfaab3e Mon Sep 17 00:00:00 2001 From: Chris Hartgerink Date: Mon, 5 Feb 2024 11:06:03 +0100 Subject: [PATCH 1/2] Merge into one `.gitignore` file --- .gitignore | 6 +++++- src/.gitignore | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 src/.gitignore diff --git a/.gitignore b/.gitignore index af8a85f7..232e04f0 100644 --- a/.gitignore +++ b/.gitignore @@ -62,4 +62,8 @@ scratch* /Meta/ /.luarc.json -.vscode \ No newline at end of file +.vscode + +src/*.o +src/*.so +src/*.dll diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 22034c46..00000000 --- a/src/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.o -*.so -*.dll From 5a49e2962e07221d1f040f4d622fde1ecaf6a769 Mon Sep 17 00:00:00 2001 From: Chris Hartgerink Date: Mon, 5 Feb 2024 11:25:34 +0100 Subject: [PATCH 2/2] Remove separate ignore files --- .github/.gitignore | 1 - .gitignore | 5 +++++ vignettes/.gitignore | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 .github/.gitignore delete mode 100644 vignettes/.gitignore diff --git a/.github/.gitignore b/.github/.gitignore deleted file mode 100644 index 2d19fc76..00000000 --- a/.github/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.html diff --git a/.gitignore b/.gitignore index 232e04f0..4edf60eb 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,8 @@ scratch* src/*.o src/*.so src/*.dll + +vignettes/*.html +vignettes/*.R + +.github/*.html \ No newline at end of file diff --git a/vignettes/.gitignore b/vignettes/.gitignore deleted file mode 100644 index 097b2416..00000000 --- a/vignettes/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.html -*.R