From e387343082687fefd460720b7e016c45a8cefa88 Mon Sep 17 00:00:00 2001
From: Nick Nisi <nick@nisi.org>
Date: Mon, 30 Apr 2012 23:26:18 -0500
Subject: [PATCH] Moving git aliases over to git dir

---
 git/aliases.zsh | 12 ++++++++++++
 zsh/aliases.zsh | 11 -----------
 2 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 git/aliases.zsh

diff --git a/git/aliases.zsh b/git/aliases.zsh
new file mode 100644
index 0000000..edfc45c
--- /dev/null
+++ b/git/aliases.zsh
@@ -0,0 +1,12 @@
+# git aliases
+alias g='git'
+alias ga='git add'
+alias gb='git branch'
+alias gl='git pull'
+alias gp='git push'
+alias gst='git s'
+alias gs='git stash save'
+alias gsp='git stash pop'
+alias gmv='git mv'
+alias grm='git rm'
+alias glog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index c659b9d..5b9a76a 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -12,14 +12,3 @@ alias grep='grep --color=auto'
 alias df='df -h' # disk free, in Gigabytes, not bytes
 alias du='du -h -c' # calculate disk usage for a folder
 
-# git aliases
-alias g='git'
-alias ga='git add'
-alias gb='git branch'
-alias gl='git pull'
-alias gp='git push'
-alias gst='git s'
-alias gs='git stash save'
-alias gsp='git stash pop'
-alias gmv='git mv'
-alias grm='git rm'