From 2d1f20e9226550b0e737b466fa962a96b967e511 Mon Sep 17 00:00:00 2001
From: Andrew Tomaka <atomaka@gmail.com>
Date: Mon, 29 Apr 2013 02:16:39 -0400
Subject: [PATCH] Update git settings

---
 .aliases   |  8 +++++---
 .gitconfig | 19 ++++++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.aliases b/.aliases
index 7433394..adb25aa 100644
--- a/.aliases
+++ b/.aliases
@@ -1,11 +1,13 @@
 alias a="ls -la"
 alias al="zsh_stats"
-alias gcm="git commit -m"
-alias gs="git status"
-alias gaa="git add ."
 alias ga="git add"
+alias gaa="git add ."
+alias gcm="git commit -m"
+alias gd="git diff"
 alias gl="git log"
+alias gh="git hist"
 alias grm="git rm"
+alias gs="git status"
 alias l="ls -lvh --color=auto"
 alias s="cd ~/Source"
 alias v="vim"
diff --git a/.gitconfig b/.gitconfig
index e09bbcc..07a102a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,13 @@
 [user]
-	name = Andrew Tomaka
-	email = atomaka@gmail.com
+    name = Andrew Tomaka
+    email = atomaka@gmail.com
+[github]
+    user = atomaka
+
+[apply]
+    whitespace = fix
+[alias]
+    hist = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
 [color]
     ui = auto
 [color "branch"]
@@ -16,14 +23,12 @@
     added = yellow
     changed = green
     untracked = cyan
-[merge]
-    tool = vimdiff
-[apply]
-    whitespace = fix
-[core]
+[core]    
     excludesfile = ~/.gitignore_global
     autocrlf = input
     editor = subl
     filemode = false
+[merge]
+    tool = vimdiff
 [push]
     default = upstream