diff --git a/gitconfig b/gitconfig
index b7b7b89..6c356d7 100644
--- a/gitconfig
+++ b/gitconfig
@@ -13,5 +13,21 @@
 	default = tracking
 [branch]
 	autosetuprebase = always
+	autosetupmerge = true
+[github]
+	user = samsonjs
+	token = 04f822d719928ee8dd9b1f0dec23ac0c
 [core]
 	quotepath = false
+	whitespace = trailing-space,space-before-tab
+	excludesfile = ~/config/gitignore
+[diff]
+	mnemonicprefix = true
+	renames = copies
+[advice]
+	statusHints = false
+	pushNonFastForward = false
+[color]
+	ui = auto
+[merge]
+	stat = true
diff --git a/gitignore b/gitignore
new file mode 100644
index 0000000..39632c3
--- /dev/null
+++ b/gitignore
@@ -0,0 +1,3 @@
+.DS_Store
+Icon\?
+