From 14a09934fd669885c2ad0d589a138d9c8a8ad73e Mon Sep 17 00:00:00 2001
From: Dreaded_X <tim@huizinga.dev>
Date: Tue, 7 Nov 2023 16:18:28 +0100
Subject: [PATCH] Added git config for work

---
 git/.gitconfig      | 8 +++++++-
 git/alten.gitconfig | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 git/alten.gitconfig

diff --git a/git/.gitconfig b/git/.gitconfig
index b2c26fc..edd408f 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -15,7 +15,10 @@
 [credential]
 	helper = store
 [pull]
-	rebase = false
+	; If we pull we only want to fast forward, if that is not possible we should not allow pull to work
+	; Instead use fetch and then either rebase or merge
+	ff = only
+	; rebase = false
 [init]
 	defaultBranch = master
 [filter "kicad_project"]
@@ -26,3 +29,6 @@
 	smudge = cat
 [commit]
 	gpgsign = true
+
+[includeIf "gitdir:~/Projects/ALTEN/"]
+	path = ~/.dotfiles/git/alten.gitconfig
diff --git a/git/alten.gitconfig b/git/alten.gitconfig
new file mode 100644
index 0000000..abc9ea8
--- /dev/null
+++ b/git/alten.gitconfig
@@ -0,0 +1,3 @@
+[user]
+	name = Tim Huizinga
+	email = tim.huizinga@alten.nl