diff --git a/gitconfig b/gitconfig
new file mode 100644
index 0000000..0220412
--- /dev/null
+++ b/gitconfig
@@ -0,0 +1,22 @@
+[user]
+	name = Thomas FORGIONE
+	email = thomas.forgione@gmail.com
+[credential]
+	helper = cache
+[push]
+	default = simple
+[diff]
+	tool = vimdiff
+[difftool]
+	prompt = false
+[alias]
+	d = difftool
+	co = checkout
+	st = status
+	ci = commit
+[log]
+	date = local
+[core]
+    quotepath = false
+[merge]
+    tool=meld
diff --git a/make-links.sh b/make-links.sh
index fb7ce17..6cdf627 100755
--- a/make-links.sh
+++ b/make-links.sh
@@ -10,3 +10,4 @@ function make_link {
 make_link zshrc .zshrc
 make_link init.vim .config/nvim/init.vim
 make_link awesome .config/awesome
+make_link gitconfig .gitconfig