From f9509f365b633ea5f07de2de2a34abe52304d42c Mon Sep 17 00:00:00 2001
From: Martin Klepsch <martinklepsch@gmail.com>
Date: Sat, 19 Dec 2009 14:35:57 +0100
Subject: [PATCH] Putting Git related aliases into git.zsh to have them in
 context.

---
 lib/aliases.zsh | 17 +----------------
 lib/git.zsh     | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index d3ee2dd8..f97daf41 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -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'
diff --git a/lib/git.zsh b/lib/git.zsh
index 52c7969f..629a08b0 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -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'