From 9c64491e7d766c3a743f56d94def836535bd991d Mon Sep 17 00:00:00 2001
From: Wryn Wagner <wagner.wryn@gmail.com>
Date: Thu, 10 Sep 2020 13:44:34 -0600
Subject: [PATCH] Added git config

---
 config/git/gitconfig | 15 +++++++++++++++
 setup                |  5 +++++
 2 files changed, 20 insertions(+)
 create mode 100644 config/git/gitconfig

diff --git a/config/git/gitconfig b/config/git/gitconfig
new file mode 100644
index 0000000..ccc13d5
--- /dev/null
+++ b/config/git/gitconfig
@@ -0,0 +1,15 @@
+[user]
+	email = wagner.wryn@gmail.com
+	name = Wryn Wagner
+[push]
+	default = current
+[difftool]
+	trustExitCode = true
+	prompt = false
+[diff]
+	tool = vimdiff
+[merge]
+	tool = vimdiff
+[pull]
+	default = current
+	rebase = true
diff --git a/setup b/setup
index 493da3e..6b60cd4 100755
--- a/setup
+++ b/setup
@@ -134,6 +134,10 @@ function CONFIG__KITTY() {
 	echo "linked kitty configuration"
 }
 
+function CONFIG__GIT() {
+	CONFIG__BASIC_SYMLINK "$HOME/.gitconfig" "$HOME/.wryn/config/git/gitconfig";
+}
+
 function CONFIG__PYLINT() {
 	CONFIG__BASIC_SYMLINK "$HOME/.config/pylintrc" "$HOME/.wryn/config/pylint/pylintrc";
 
@@ -159,6 +163,7 @@ function CONFIG__SETUP() {
 	CONFIG__COMPTON;
 	CONFIG__KITTY;
 
+	CONFIG__GIT;
 	CONFIG__PYLINT;
 	CONFIG__TMUX;