From 122bd00d25a073f538aec10c065503f00650d555 Mon Sep 17 00:00:00 2001
From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
Date: Tue, 5 Nov 2019 12:19:58 -0500
Subject: [PATCH] zero-system: update gitconfig for new git version

---
 pentoo/zero-system/files/gitconfig                              | 2 +-
 .../{zero-system-2019.2-r1.ebuild => zero-system-2019.3.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pentoo/zero-system/{zero-system-2019.2-r1.ebuild => zero-system-2019.3.ebuild} (100%)

diff --git a/pentoo/zero-system/files/gitconfig b/pentoo/zero-system/files/gitconfig
index 32fa75554..969dd05b2 100644
--- a/pentoo/zero-system/files/gitconfig
+++ b/pentoo/zero-system/files/gitconfig
@@ -21,7 +21,7 @@
 [commit]
 	gpgsign = true
 [pull]
-  rebase = preserve
+  rebase = true
 [tag]
 	gpgsign = true
 #this causes bad exit codes and more harm than good
diff --git a/pentoo/zero-system/zero-system-2019.2-r1.ebuild b/pentoo/zero-system/zero-system-2019.3.ebuild
similarity index 100%
rename from pentoo/zero-system/zero-system-2019.2-r1.ebuild
rename to pentoo/zero-system/zero-system-2019.3.ebuild