diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..76e5eb5
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,14 @@
+[user]
+	email = paul@hptrow.me
+	name = Paul Trowbridge
+[core]
+	autocrlf = false
+	editor = vim
+[push]
+	default = simple
+[alias]
+        quick-stats = ! /usr/local/bin/git-quick-stats
+[log]
+        date = format:%Y-%m-%d %H:%M:%S
+[format]
+        pretty = format:'%C(yellow)%h %Cred%ad %Cblue%an %Cgreen%d %Creset%s'
diff --git a/setup.sh b/setup.sh
index b6dd967..3ac05c9 100755
--- a/setup.sh
+++ b/setup.sh
@@ -5,7 +5,7 @@
 
 dir=~/dot_config
 backup=~/dot_config_backup
-files=".bashrc .vimrc .tmux.conf .psqlrc"
+files=".bashrc .vimrc .tmux.conf .psqlrc .gitconfig"
 
 #------------------------------------------------ create the resore directory if it doesn't already exist--------------------------------------------------