@@ -25,21 +25,6 @@ alias ss='sudo su -'

 #alias g='grep -in'

-# Git related

-alias g='git'

-alias gst='git status'

-alias gl='git pull'

-alias gup='git fetch && git rebase'

-alias gp='git push'

-alias gd='git diff | mate'

-alias gdv='git diff -w "$@" | vim -R -'

-alias gc='git commit -v'

-alias gca='git commit -v -a'

-alias gb='git branch'

-alias gba='git branch -a'

-alias gcount='git shortlog -sn'

-alias gcp='git cherry-pick'

-

 # Show history

 alias history='fc -l 1'

@@ -65,4 +50,4 @@ alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Ra

 alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'

 # Editor Ruby file in TextMate

-alias mr='mate CHANGELOG app config db lib public script spec test'

\ No newline at end of file

+alias mr='mate CHANGELOG app config db lib public script spec test'

@@ -20,3 +20,18 @@ function current_branch() {

   ref=$(git symbolic-ref HEAD 2> /dev/null) || return

   echo ${ref#refs/heads/}

 }

+

+# Aliases

+alias g='git'

+alias gst='git status'

+alias gl='git pull'

+alias gup='git fetch && git rebase'

+alias gp='git push'

+alias gd='git diff | mate'

+alias gdv='git diff -w "$@" | vim -R -'

+alias gc='git commit -v'

+alias gca='git commit -v -a'

+alias gb='git branch'

+alias gba='git branch -a'

+alias gcount='git shortlog -sn'

+alias gcp='git cherry-pick'