From 3bd64cb38422ac507ada1b8566f30fea8c20cfd8 Mon Sep 17 00:00:00 2001
From: Dan Buch <dan@meatballhat.com>
Date: Sat, 28 Dec 2013 12:37:46 -0500
Subject: [PATCH] Minor gitconfig tweaks + normalizing whitespace (tabs)

---
 gitconfig | 122 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 63 insertions(+), 59 deletions(-)

diff --git a/gitconfig b/gitconfig
index 4ee978b..7ca511f 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,80 +1,84 @@
 [user]
-    name = Dan Buch
-    email = daniel.buch@gmail.com
+	name = Dan Buch
+	email = dan@meatballhat.com
+
+[github]
+	user = meatballhat
 
 [core]
-    excludesfile = ~/.git-global-ignores
-    autocrlf = false
+	excludesfile = ~/.git-global-ignores
+	autocrlf = false
+	pager = less -FRX
 
 [daemon]
-    uploadpack = true
-    uploadarch = true
-    receivepack = true
+	uploadpack = true
+	uploadarch = true
+	receivepack = true
 
 [push]
-	default = simple
+	default = tracking
 
 [color]
-    ui = auto
+	ui = auto
 
 [color "branch"]
-    current = yellow reverse
-    local = yellow
-    remote = green
+	current = yellow reverse
+	local = yellow
+	remote = green
 
 [color "diff"]
-    meta = yellow bold
-    frag = magenta bold
-    old = red bold
-    new = green bold
+	meta = yellow bold
+	frag = magenta bold
+	old = red bold
+	new = green bold
 
 [color "status"]
-    added = yellow
-    changed = green
-    untracked = cyan
+	added = yellow
+	changed = green
+	untracked = cyan
 
 [alias]
-    a = add
-    ad = add
-    addd = add
-    br = branch
-    bra = branch -a
-    brr = branch -r
-    ci = commit
-    co = checkout
-    d = diff
-    dc = diff --cached
-    di = diff
-    dif = diff
-    l = ls-files
-    ls = ls-files
-    nuke = clean -dfx
-    pr = pull --rebase
-    s = status --short
-    st = status
-    sta = stash
-    stcq = diff --cached --name-only
-    stq = diff --name-only
-    t = tag
-    ta = tag
-    tags = tag
-
-    slog = log git-svn..
-    sup = svn fetch --all
-    spush = svn dcommit
-    srb = rebase git-svn
-
-    cm = checkout master
-    lm = log master..
-
-    rt = rebase trunk
-    lt = log trunk..
-    ct = checkout svn/trunk
-
-    logv = log --name-status
+	a = add
+	ad = add
+	addd = add
+	br = branch
+	bra = branch -a
+	brr = branch -r
+	ci = commit
+	co = checkout
+	d = diff
+	dc = diff --cached
+	di = diff
+	dif = diff
+	l = ls-files
+	ls = ls-files
+	nuke = clean -dfx
+	pr = pull --rebase
+	s = status --short
+	st = status
+	sta = stash
+	stcq = diff --cached --name-only
+	stq = diff --name-only
+	t = tag
+	ta = tag
+	tags = tag
+
+	slog = log git-svn..
+	sup = svn fetch --all
+	spush = svn dcommit
+	srb = rebase git-svn
+
+	cm = checkout master
+	lm = log master..
+
+	rt = rebase trunk
+	lt = log trunk..
+	ct = checkout svn/trunk
+
+	logv = log --name-status
 
 
 [clean]
-    requireForce = false
+	requireForce = false
 
-# vim:filetype=cfg
+# vim: set filetype=cfg noexpandtab: