Scala improvements, updated gitignore for notes and added DOTNET_CLI_…

…TELEMETRY_OPTOUT env var to opt out of microsoft telemetry

bin/scalatest_diff

@@ -13,6 +13,8 @@ if len(args) == 1:
         splited = scalatest_output.split("did not equal")
     elif "was not equal to" in scalatest_output:
         splited = scalatest_output.split("was not equal to")
+    elif "did not contain the same elements as" in scalatest_output:
+        splited = scalatest_output.split("did not contain the same elements as")
     else:
         splited = None
     import difflib

gitignore_global

@@ -131,3 +131,6 @@ own-alias.sbt
 
 # VSCode
 .vscode
+
+# Temporal notes
+tmp_note*

sbt/1.0/plugins/plugins.sbt

@@ -1,5 +1,5 @@
 addSbtPlugin("org.duhemm" % "sbt-errors-summary" % "0.6.0")
-addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1")
+// addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1")
 addSbtPlugin("com.github.tkawachi" % "sbt-repeat" % "0.1.0")
 
 

zshrc

@@ -168,6 +168,8 @@ function kill_sbt() { ps aux | grep java | grep bin/sbt-launch.jar | awk '{print
 alias fucksbt="kill_sbt"
 alias killsbt="kill_sbt"
 
+# C# setup
+export DOTNET_CLI_TELEMETRY_OPTOUT=1
 
 
 # Service aliases
@@ -835,6 +837,9 @@ function gcurrent_branch_name() { git rev-parse --abbrev-ref HEAD ; }
 alias git_branch_name=gcurrent_branch_name
 alias gbname=gcurrent_branch_name
 
+alias grh="git reset --hard"
+function grh_same_branch_origin() { git reset --hard "origin/$(gcurrent_branch_name)" ; }
+
 alias grm_deleted_files="git ls-files --deleted -z | xargs -0 git rm"  # Git rm files that have been deleted
 
 alias gl="git log --graph --pretty=format:'%C(yellow)%h%Creset -%C(green)%d%Creset %s %C(magenta)(%cr) %C(cyan)<%an>%Creset' --abbrev-commit"