diff --git a/.bash_aliases b/.bash_aliases
index 5d19b11..bd6b517 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -7,6 +7,7 @@ alias rm='rm -I'
 alias gdp='git diff --color HEAD^ HEAD'
 alias gl='git log --pretty=format:"%Cgreen%h %Creset %s %Cgreenby %an (%ar) %Cred %d" --graph'
 alias gdc='git diff --color'
+alias gst='git status'
 
 # export standard terminal for remote connections
 #alias ssh='export TERM=xterm && ssh'
diff --git a/.gitconfig b/.gitconfig
index 9039598..5f7e866 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,6 +2,9 @@
 	name = Oliver Ladner
 	email = waste@lugh.ch
 
+[core]
+        editor = vim
+
 [color]
 	branch = auto
 	diff = auto