Git things

.gitconfig

@@ -40,6 +40,7 @@
     edit-conflicted = ! git diff --name-only | uniq | xargs code
     history = log -p --
 	pushf = push --force-with-lease
+    pullall = ! git pull && git submodule update --init --recursive --remote
 
 [core]
 	editor = vim
@@ -49,6 +50,7 @@
 
 [merge]
 	tool = code
+	conflictstyle = diff3
 
 [push]
 	default = upstream

.rc.d/applications.sh

@@ -5,8 +5,8 @@ if [ -d "${HOME}/.nvm" ]; then
 fi
 
 # export golang bin path
-if [ -d "~/go/bin" ]; then
-  export PATH=$PATH:~/go/bin
+if [ -d "$HOME/go/bin" ]; then
+  export PATH=$PATH:$HOME/go/bin
 fi
 
 # thefuck