From 379d4b2c908cd4b1892a1bc2a1cd78c4f9d9c484 Mon Sep 17 00:00:00 2001
From: David Todd <dtodd@oceantech.com>
Date: Mon, 28 Sep 2020 14:50:22 -0500
Subject: [PATCH] Change merge stratigy

---
 home/gitconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/home/gitconfig b/home/gitconfig
index 20313af..4775eed 100644
--- a/home/gitconfig
+++ b/home/gitconfig
@@ -32,6 +32,7 @@
 	pull-with-submodules = !git pull && git submodule update --init
 	rpull-with-submodules = !git pull --rebase --stat && git submodule update --init
 	freeze = !git-freeze
+	tags = log -n1 --pretty=format:%h%d
 [merge]
 	tool = vimdiff
 [mergetool "fugitive"]
@@ -46,3 +47,5 @@
 	guitool = kdiff3
 [difftool "kdiff3"]
 	path = /usr/bin/kdiff3
+[pull]
+	rebase = true