f9509f365b633ea5f07de2de2a34abe52304d42c

 1diff --git a/lib/aliases.zsh b/lib/aliases.zsh
 2index d3ee2dd8c38ef3cf0ae01817c7306daa3a1456c1..f97daf41a0a8cb2bf6b267d43ef8455c11460a18 100644
 3--- a/lib/aliases.zsh
 4+++ b/lib/aliases.zsh
 5@@ -25,21 +25,6 @@ alias ss='sudo su -'
 6 
 7 #alias g='grep -in'
 8 
 9-# Git related
10-alias g='git'
11-alias gst='git status'
12-alias gl='git pull'
13-alias gup='git fetch && git rebase'
14-alias gp='git push'
15-alias gd='git diff | mate'
16-alias gdv='git diff -w "$@" | vim -R -'
17-alias gc='git commit -v'
18-alias gca='git commit -v -a'
19-alias gb='git branch'
20-alias gba='git branch -a'
21-alias gcount='git shortlog -sn'
22-alias gcp='git cherry-pick'
23-
24 # Show history
25 alias history='fc -l 1'
26 
27@@ -65,4 +50,4 @@ alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Ra
28 alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
29 
30 # Editor Ruby file in TextMate
31-alias mr='mate CHANGELOG app config db lib public script spec test'
32+alias mr='mate CHANGELOG app config db lib public script spec test'
33diff --git a/lib/git.zsh b/lib/git.zsh
34index 52c7969f37f5e3e51d197a74d9d29c6f3df05d96..629a08b0e10b370ebe923d00ea1e137374c080b8 100644
35--- a/lib/git.zsh
36+++ b/lib/git.zsh
37@@ -20,3 +20,18 @@ function current_branch() {
38   ref=$(git symbolic-ref HEAD 2> /dev/null) || return
39   echo ${ref#refs/heads/}
40 }
41+
42+# Aliases
43+alias g='git'
44+alias gst='git status'
45+alias gl='git pull'
46+alias gup='git fetch && git rebase'
47+alias gp='git push'
48+alias gd='git diff | mate'
49+alias gdv='git diff -w "$@" | vim -R -'
50+alias gc='git commit -v'
51+alias gca='git commit -v -a'
52+alias gb='git branch'
53+alias gba='git branch -a'
54+alias gcount='git shortlog -sn'
55+alias gcp='git cherry-pick'