put git aliases inside test

06_git

@@ -22,7 +22,7 @@ if [[ -x `which git` ]]; then
 		fi
 	}
 	function git-prompt() {
-	    emulate -L zsh
+	  emulate -L zsh
 		dirty_color=$fg[cyan]
 		branch=$(echo $gstatus | head -n 1 | sed 's/^# On branch //')
 		if [[ $branch == '# Not currently on any branch.' ]]; then
@@ -68,22 +68,24 @@ if [[ -x `which git` ]]; then
 	function nhgk () {
 		nohup gitk --all &
 	}
-fi
 
-alias gb='git branch -a -v'
-alias gs='git status'
-alias gd='git diff'
-alias gf='git fetch'
-alias gr='git-rebase'
-alias gsc='git-svn dcommit'
-alias gsr='git-svn rebase'
-alias gsf='git-svn fetch'
-# gc      => git checkout master
-# gc bugs => git checkout bugs
-function gc {
+
+  alias g='git'
+  alias gb='git branch -a -v'
+  alias gs='git status'
+  alias gd='git diff'
+  alias gf='git fetch'
+  alias gr='git-rebase'
+  alias gsc='git-svn dcommit'
+  alias gsr='git-svn rebase'
+  alias gsf='git-svn fetch'
+  # gc      => git checkout master
+  # gc bugs => git checkout bugs
+  function gc {
   if [ -z "$1" ]; then
     git checkout master
-  else
+    else
     git checkout $1
   fi
-}
+  }
+fi