diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 1a072d5..aa205e1 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -10,9 +10,8 @@ alias share-via-ssh='/home/kunsi/git/share-via-ssh/share-via-ssh'
 
 alias bwr='cd ~/git/bundlewrap/'
 alias v='vim -p'
-alias r='vim -R'
-alias master='git checkout master && git pull --all'
-alias s='git status --short'
+alias gm='git checkout master && git pull --all'
+alias gs='git status --short'
 alias hist='git log --pretty --oneline'
 alias l='ls -lAh'