diff --git a/fish/config.fish b/fish/config.fish
index 872737a..b042708 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -27,8 +27,8 @@ alias chgrp='chgrp --preserve-root'
 alias cls=' echo -ne "\033c"'
 alias ps='ps aux k%cpu'
 alias new='touch'
-alias re='reboot'
-alias off='poweroff'
+alias re='/sbin/reboot'
+alias off='/sbin/poweroff'
 alias vol='alsamixer'
 alias q=' exit'
 alias Q=' exit'
@@ -48,6 +48,10 @@ if [ -z $VISUAL ]
 	set -Ux VISUAL es
 end
 
+if [ -z $GIT_EDITOR ]
+	set -Ux GIT_EDITOR es
+end
+
 if [ -z $GOPATH ]
 	set -Ux GOPATH ~/.go
 end