updated

number5 · Nov 15, 2015 · d06b607 · d06b607
1 parent 1348f36
commit d06b607
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/modules/overrides/parts.d/30-aliases b/modules/overrides/parts.d/30-aliases
@@ -73,4 +73,7 @@ alias gpj='git push origin HEAD:refs/heads/jenkins '
 
 alias ':wq'='echo "You are not in vim, dummy"'
 
+# remove aliases conflict with command
+unalias gb
+
 # vim:ft=zsh
diff --git a/modules/overrides/parts.d/51-luajit-torch b/modules/overrides/parts.d/51-luajit-torch
@@ -1 +1,3 @@
+function activate-torch {
 . /Users/bruce/src/git/torch/install/bin/torch-activate
+}
diff --git a/modules/overrides/parts.d/65-dockerfunc b/modules/overrides/parts.d/65-dockerfunc
@@ -77,7 +77,7 @@ cadvisor(){
         open "http://$(docker-machine ip $DOCKER_MACHINE_NAME):9999"
 }
 
-consul(){
+docker_consul(){
 	del_stopped consul
 
 	# check if we passed args and if consul is running