From e2908d44cec4161f6eb89d1aa8098e3ca12eedc5 Mon Sep 17 00:00:00 2001
From: user <user@example.org>
Date: Tue, 4 Jul 2023 17:44:16 +0200
Subject: [PATCH] add git config

---
 arch-graphical-install-auto.sh | 1 +
 arch-install.sh                | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch-graphical-install-auto.sh b/arch-graphical-install-auto.sh
index 3c225ad..9f3f328 100755
--- a/arch-graphical-install-auto.sh
+++ b/arch-graphical-install-auto.sh
@@ -58,6 +58,7 @@ function gitclone() {
     git config --global user.name "user"
     git config --global push.default simple
     git config --global pull.rebase true
+    git config --global merge.tool vimdiff
     git config --global --add safe.directory '*'
 
     # Aktualisiere die Repositiories
diff --git a/arch-install.sh b/arch-install.sh
index ec376af..d3501f3 100755
--- a/arch-install.sh
+++ b/arch-install.sh
@@ -4,7 +4,6 @@ set -ex
 
 clear
 
-git config --global credential.helper store
 arch=$(uname -m)
 branch=master
 repo=SpectreOS
@@ -83,6 +82,7 @@ function gitclone() {
     git config --global user.name "user"
     git config --global push.default simple
     git config --global pull.rebase true
+    git config --global merge.tool vimdiff
     if [ -d "/opt/${repo}" ]; then
         echo "${repo} existiert bereits!!!"
         cd /opt/${repo}