Another update I guess

rbndelrio · Aug 12, 2019 · 77518cf · 77518cf
1 parent 6c1a4e2
commit 77518cf
Show file tree

Hide file tree

Showing 6 changed files with 766 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 *.tmPreferences.cache
 *.stTheme.cache
 *.sublime-workspace
+*/.git
 
 Package Control.sublime-settings
 Package Control.merged-ca-bundle

diff --git a/Theme - Afterglow b/Theme - Afterglow
diff --git a/bash/bash_profile b/bash/bash_profile
@@ -32,6 +32,7 @@ alias 1='project'
 alias dockerip="docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}'"
 alias webcam-fix='sudo killall AppleCameraAssistant; sudo killall VDCAssistant'
 alias docker-purge='docker stop $(docker ps -aq)'
+alias dokku='~/.dokku/contrib/dokku_client.sh'
 
 # Git commands
 alias gs='git status '

diff --git a/git/gitconfig b/git/gitconfig
@@ -30,7 +30,7 @@
 	short = true
 	branch = false #disabled because powerline already shows this
 [rerere]
-	enabled = true
+	enabled = 1
 	autoupdate = true
 # Lets git remember how merge conflicts are solved
 [filter "lfs"]