From b2769dc74241cfe6addcd46e06e6a69063d9869d Mon Sep 17 00:00:00 2001
From: Niels Mokkenstorm <niels@mokkenstorm.dev>
Date: Mon, 20 Jul 2026 13:50:52 +0200
Subject: [PATCH] feat(git): enable per-context commit signing, rebase pulls,
 ff-only merges

---
 .gitconfig          | 20 ++++++++++++++++++--
 .gitconfig-personal |  3 +++
 .gitconfig-riotbyte |  1 +
 .gitconfig-skalar   |  3 +++
 4 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 .gitconfig-personal

diff --git a/.gitconfig b/.gitconfig
index 7f6ff1b..95f68eb 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,26 +1,35 @@
 [user]
 	name = Niels Mokkenstorm
 	email = niels@mokkenstorm.dev
+	signingkey = 9048D9E07F5F887F
 
 [includeIf "gitdir:~/Developer/riotbyte/"]
 	path = ~/.gitconfig-riotbyte
 
 [includeIf "gitdir:~/Developer/skalar/"]
 	path = ~/.gitconfig-skalar
+
+[includeIf "gitdir:~/Developer/mokkenstorm-dev/"]
+	path = ~/.gitconfig-personal
+
+[includeIf "gitdir:~/Developer/personal/"]
+	path = ~/.gitconfig-personal
 [core]
 	excludesfile = /Users/niels/.globalgitignore
 [pull]
-	rebase = false
+	rebase = true
 [rebase]
 	instructionFormat = (%an <%ae>) %s
+	autoStash = true
 [init]
 	defaultBranch = main
 [push]
 	autoSetupRemote = true
 [alias]
 	tree = log --oneline --decorate --all --graph
+	yolo = ! git add . && git commit --amend --no-edit && git push --force-with-lease
 [commit]
-	gpgsign = false
+	gpgsign = true
 [tag]
 	gpgsign = false
 
@@ -47,3 +56,10 @@
 	date = format:%Y-%m-%d %H:%M
 [format]
 	pretty = %C(yellow)%h%Creset %C(green)%ad%Creset %C(blue)%an <%ae>%Creset %s%C(red)%d%Creset
+[merge]
+	ff = only
+[gpg]
+	format = openpgp
+	program = /opt/homebrew/bin/gpg
+[gpg "ssh"]
+	allowedSignersFile = /Users/niels/.ssh/allowed_signers
diff --git a/.gitconfig-personal b/.gitconfig-personal
new file mode 100644
index 0000000..dea492e
--- /dev/null
+++ b/.gitconfig-personal
@@ -0,0 +1,3 @@
+[user]
+	email = niels@mokkenstorm.dev
+	signingkey = 9048D9E07F5F887F
diff --git a/.gitconfig-riotbyte b/.gitconfig-riotbyte
index e7d477f..397a45b 100644
--- a/.gitconfig-riotbyte
+++ b/.gitconfig-riotbyte
@@ -1,2 +1,3 @@
 [user]
 	email = niels@riotbyte.com
+	signingkey = 588EDBC53044B7BA
diff --git a/.gitconfig-skalar b/.gitconfig-skalar
index a4a4be0..d5cb8a1 100644
--- a/.gitconfig-skalar
+++ b/.gitconfig-skalar
@@ -1,2 +1,5 @@
 [user]
 	email = mokkenstorm.n@skalar.com
+	signingkey = 1C0ECB076E978878769CB12D740BC0F52900C5E4
+[gpg]
+	format = openpgp
-- 
2.51.2