diff --git a/.bashrc b/.bashrc
index cdaa3c3..f13bddc 100644
--- a/.bashrc
+++ b/.bashrc
@@ -21,8 +21,10 @@ export PS1='\h:\W \u$(__git_ps1 " \[${COLOR_RED}\](%s)\[${COLOR_NC}\]")\$ '
 
 export TERM=xterm-color
 export GREP_OPTIONS='--color=auto' GREP_COLOR='1;32'
-export CLICOLOR=1 
+export CLICOLOR=1
 export EDITOR='mate -w'
+export GIT_EDITOR='mate -w'
+export VISUAL='mate -w'
 # sets title of window to be user@host
 export PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*} ${PWD}"; echo -ne "\007"' 
 
@@ -45,8 +47,8 @@ alias sc='ruby ./script/console'
 # git stuff
 alias gi='git init'
 alias ga='git add .'
-alias gc='git commit -m'
-alias gac='git commit -a -m'
+alias gc='git commit'
+alias gac='git commit -a'
 alias gps='git push origin master'
 alias gpl='git pull origin master'
 
diff --git a/.gitconfig b/.gitconfig
index d9b2bea..3d5c45d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -23,3 +23,5 @@
   untracked = cyan
 [github]
 	user = bjeanes
+[core]
+	editor = mate -w