From 9cb66b31853cd3dbd14f1ea54364e0b5f6a2f25f Mon Sep 17 00:00:00 2001
From: Tyrel Souza <tyrelsouza@gmail.com>
Date: Thu, 7 Apr 2016 14:04:31 -0400
Subject: [PATCH] add prettier log, and prettier diff

---
 gitconfig | 7 +++++++
 zshrc     | 1 +
 2 files changed, 8 insertions(+)

diff --git a/gitconfig b/gitconfig
index 00aff3c..9e8102e 100644
--- a/gitconfig
+++ b/gitconfig
@@ -6,6 +6,9 @@
 	signingkey = 8A2DDEE2
 [commit]
     gpgsign = true
+[color]
+  ui = auto # covers diff = true, status = auto, branch = auto
+  interactive = auto
 [push]
 	default = simple
 [format]
@@ -13,6 +16,8 @@
 [alias]
     # show all these aliases
     alias = "!git config -l | grep alias | cut -c 7-"
+    # Way more information on git log
+    ll = log --stat --abbrev-commit
     # Show files modified per commit
     files = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
     # show a tree with branches merging 
@@ -25,6 +30,8 @@
     v=describe --tags --match 'v*'
     # alias like `hg st`, because I like st, shorter is nice!
     st = status
+    # prettier diffs
+    d = diff --color-words
 [filter "lfs"]
 	clean = git-lfs clean %f
 	smudge = git-lfs smudge %f
diff --git a/zshrc b/zshrc
index d292162..211fb54 100644
--- a/zshrc
+++ b/zshrc
@@ -39,6 +39,7 @@ source ~/.bash_aliases
 alias cg='cd "$(git rev-parse --show-toplevel)"'
 alias fuck='eval $(thefuck $(fc -ln -1)); history -r'
 alias ag='\ag --pager="less"'
+alias g='git'
 
 if [ -e ~/.ssh/id_rsa ];then
   ssh-add ~/.ssh/id_addgene