From 20303b825d4689edba09fef8eb2fed4dc19a2e01 Mon Sep 17 00:00:00 2001
From: Brandon Siegel <brandon@smartercode.net>
Date: Wed, 18 Jul 2012 04:22:32 -0400
Subject: [PATCH] Merge pull request #1230 from origin

---
 plugins/git/git.plugin.zsh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index d3d3f702a..c6d7fd790 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -5,10 +5,14 @@ alias gst='git status'
 compdef _git gst=git-status
 alias gl='git pull'
 compdef _git gl=git-pull
+alias gf='git fetch'
+compdef _git gf=git-fetch
 alias gup='git fetch && git rebase'
 compdef _git gup=git-fetch
 alias gp='git push'
 compdef _git gp=git-push
+alias gd='git diff --color'
+compdef _git gd=git-diff
 gdv() { git diff -w "$@" | view - }
 compdef _git gdv=git-diff
 alias gc='git commit -v'
@@ -26,9 +30,11 @@ alias gcount='git shortlog -sn'
 compdef gcount=git
 alias gcp='git cherry-pick'
 compdef _git gcp=git-cherry-pick
-alias glg='git log --stat --max-count=5'
+alias glg='git log --stat --color'
 compdef _git glg=git-log
-alias glgg='git log --graph --max-count=5'
+alias glgp='git log --stat --color -p'
+compdef _git glgp=git-log
+alias glgg='git log --graph --color'
 compdef _git glgg=git-log
 alias gss='git status -s'
 compdef _git gss=git-status