upgrade

.gitattributes

@@ -1 +1 @@
-* text=auto
+* text=auto

.gitconfig

@@ -5,22 +5,25 @@
 [help]
 	autocorrect = 1
 [color]
-  ui = always
+	ui = true
 [apply]
   whitespace = fix
 [core]
   excludesfile = ~/.gitignore
   attributesfile = ~/.gitattributes
   whitespace = fix,space-before-tab,tab-in-indent,trailing-space
+	pager = diff-so-fancy | less --tabs=4 -RFX
 [color "branch"]
   current = yellow reverse
   local = yellow
   remote = green
 [color "diff"]
-  meta = yellow bold
-  frag = magenta bold
-  old = red bold
-  new = green bold
+	meta = yellow
+	frag = magenta bold
+	old = red bold
+	new = green bold
+	commit = yellow bold
+	whitespace = red reverse
 [color "status"]
   added = yellow
   changed = green
@@ -44,4 +47,30 @@
 # http://rentzsch.tumblr.com/post/564806957/public-but-hackable-git-submodules
 [url "git@github.com:maxbeatty/"]
   insteadOf = "git://github.com/maxbeatty/"
-
+
+[push]
+  default = tracking
+[diff]
+  renames = copies
+[rerere]
+  enabled = true
+[user]
+	signingkey = EBC283750642C55A
+	name = Max Beatty
+	email = max@beatty.me
+[commit]
+	gpgsign = true
+[gpg]
+	program = /usr/local/bin/gpg
+[tag]
+	gpgsign = true
+[filter "lfs"]
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true
+[color "diff-highlight"]
+	oldNormal = red bold
+	oldHighlight = red bold 52
+	newNormal = green bold
+	newHighlight = green bold 22

.gitignore

@@ -1,16 +1,2 @@
-.extra
-
-# Compiled Python files
-*.pyc
-
 # Folder view configuration files
 .DS_Store
-Desktop.ini
-
-# Thumbnail cache files
-._*
-Thumbs.db
-
-# Files that might appear on external disks
-.Spotlight-V100
-.Trashes