diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..c9d59ec
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,29 @@
+[user]
+  name = Jeff Geerling
+  email = geerlingguy@mac.com
+[core]
+  editor = vi
+  excludesfile = ~/.gitignore
+[color]
+  branch = auto
+  diff = auto
+  interactive = auto
+  status = auto
+[web]
+  browser = google-chrome
+[credential]
+  helper = osxkeychain
+[push]
+  default = simple
+[merge]
+  tool = kdiff3
+[difftool]
+  prompt = false
+[alias]
+  c = commit
+  ca = commit -a
+  cm = commit -m
+  cam = commit -am
+  d = diff
+  dc = diff --cached
+  l = log --oneline --graph --decorate
diff --git a/.gitignore b/.gitignore
index 3c0436a..127c0ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 *.DS_Store
 *.LSOverride
+Icon?
+Thumbs.db
\ No newline at end of file