From ac88bcc7abeffd72588c57caad2cde509ba00d18 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 20 Sep 2014 16:40:27 -0400
Subject: [PATCH] Clean up + add aliases to gitconfig

---
 gitconfig | 41 ++++++++++++++---------------------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/gitconfig b/gitconfig
index 512777b1..0854c577 100644
--- a/gitconfig
+++ b/gitconfig
@@ -3,37 +3,24 @@
 	email = henrik@lissner.net
 [github]
 	user = hlissner
-
 [core]
-    excludesfile = ~/.gitignore
-    quotepath = false
-    whitespace = trailing-space
-
+	excludesfile = ~/.gitignore
+	whitespace = trailing-space
 [color]
-    ui = auto
-
+	ui = true
 [diff]
-    tool = gvimdiff
-
+	tool = vimdiff
 [difftool]
-    prompt = false
-
+	prompt = false
 [merge]
-    # Include summaries of merged commits in newly created merge commit messages
-    log = true
-
+	# Include summaries of merged commits in newly created merge commit messages
+	log = true
 [push]
-    default = matching
-
-[url "ssh://git@github.com"]
-    insteadOf = "gh:"
-[url "ssh://git@github.com/hlissner"]
-    insteadOf = "gh:~"
-
-[url "ssh://git@bitbucket.org"]
-    insteadOf = "bb:"
-[url "ssh://git@bitbucket.org/hlissner"]
-    insteadOf = "bb:~"
-
+	default = simple
 [credential]
-    helper = osxkeychain
+	helper = osxkeychain
+[alias]
+	undo-commit = reset --soft "HEAD^"
+	amend = commit --amend
+	ls = ls-files
+	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --