From 906990c3fd841b571d802d823f4d17fcb39c37ac Mon Sep 17 00:00:00 2001 From: Benjamin Auder Date: Mon, 30 Jan 2017 01:18:25 +0100 Subject: [PATCH] reorganize .gitignore files --- .gitignore | 12 ++++++++++++ data/.gitignore | 4 ---- old_C_code/.gitignore | 4 ---- emergency_mode => old_C_code/emergency_mode | 3 +++ 4 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 data/.gitignore rename emergency_mode => old_C_code/emergency_mode (59%) diff --git a/.gitignore b/.gitignore index 4ce0103..f577abe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,15 @@ +#datasets +/data/* +!/data/README + +#files generated by initialize.sh +/.gitfat +/.gitattributes + #ignore temporary files *~ *.swp + +#ignore R session files +.Rhistory +.RData diff --git a/data/.gitignore b/data/.gitignore deleted file mode 100644 index ce023e2..0000000 --- a/data/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -#ignore all but this file, and README -* -!.gitignore -!README diff --git a/old_C_code/.gitignore b/old_C_code/.gitignore index f9c22cb..1ebda79 100644 --- a/old_C_code/.gitignore +++ b/old_C_code/.gitignore @@ -1,6 +1,2 @@ #ignore building files and folders build/ - -#ignore object files + library -*.o -*.so diff --git a/emergency_mode b/old_C_code/emergency_mode similarity index 59% rename from emergency_mode rename to old_C_code/emergency_mode index 10a68df..92c1cd0 100644 --- a/emergency_mode +++ b/old_C_code/emergency_mode @@ -1,3 +1,6 @@ +#seems that current code doesn't work great (deserialize is broken somewhere). +#So, this allow to use old code as it worked for JdS slides (e.g.): + git reset --hard 16da38ab3419e7063ce367eb878a9e60d2... cd code/stage1/build -- 2.44.0