From 15f009fe69ff88ecf6adfadb7017689b5a423ece Mon Sep 17 00:00:00 2001
From: Tony Grosinger <tgrosinger@extrahop.com>
Date: Thu, 24 Jul 2014 13:35:11 -0700
Subject: [PATCH] Added new aliases and default settings for git

---
 .gitconfig | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitconfig b/.gitconfig
index e0ab78a..0bdd691 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -8,10 +8,16 @@
   c = commit
   s = status
   b = branch
-  pp = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
+  pp = log --color --graph --pretty=format:'%Cred%h%Creset %Cgreen(%cr) %Creset\t%s %C(bold blue)<%an> %C(yellow)%d%Creset' --abbrev-commit
+  cr = difftool --dir-diff
   type = cat-file -t
   dump = cat-file -p
 [push]
 	default = simple
 [core]
 	editor = vim
+	pager = less -F -R -X -x1,5
+[diff]
+    tool = meld
+[branch]
+    autosetuprebase = always