3 files changed, 25 insertions, 0 deletions
diff --git a/deploy.sh b/deploy.sh
index 8497492..a9b9b95 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -7,6 +7,7 @@ stow bspwm
 stow conky
 stow emacs
 stow evolution
+stow git
 stow nextcloud
 stow rofi
 stow sxhkd
diff --git a/git/.gitconfig b/git/.gitconfig
new file mode 100644
index 0000000..b5e501d
--- /dev/null
+++ b/git/.gitconfig
@@ -0,0 +1,23 @@
+[user]
+	email = d@drobilla.net
+	name = David Robillard
+[merge]
+	conflictstyle = zdiff3
+[pull]
+	ff = only
+[init]
+	defaultBranch = main
+[rerere]
+	enabled = true
+	autoupdate = true
+[diff]
+	colorMoved = plain
+	mnemonicPrefix = true
+	renames = true
+	algorithm = histogram
+[tag]
+	sort = version:refname
+[branch]
+	sort = -committerdate
+[advice]
+	mergeConflict = false
diff --git a/undeploy.sh b/undeploy.sh
index d4874e1..52b4860 100755
--- a/undeploy.sh
+++ b/undeploy.sh
@@ -7,6 +7,7 @@ rm ~/.config/bspwm
 rm ~/.conkyrc
 rm ~/.emacs.d
 rm ~/.config/evolution
+rm ~/.gitconfig
 rm ~/.config/nextcloud
 rm ~/.config/rofi
 rm ~/.config/sxhkd