From a23d4e6265a7c5834ca61d90b35f0a4c3c513312 Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Mon, 2 Nov 2020 23:31:41 +0100
Subject: [PATCH] gitconfig updates

---
 gitconfig | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gitconfig b/gitconfig
index 06132d1..a5bebe3 100644
--- a/gitconfig
+++ b/gitconfig
@@ -50,8 +50,9 @@
 
     # Remove branches that have already been merged with master
     # a.k.a. ‘delete merged’
-    dm = "!git branch --merged master | grep -v '\\* master' | xargs -n 1 git branch -d"
-
+    dm = "!git branch --merged main | grep -v '\\* main' | xargs -n 1 git branch -d"
+    dma = "!git branch --merged master | grep -v '\\* master' | xargs -n 1 git branch -d"
+    
     uncommit = reset --soft HEAD^
     unstage  = reset HEAD
     yolo     = push --force
@@ -88,3 +89,7 @@
 	clean = git-lfs clean -- %f
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
+[pull]
+	rebase = false
+[gpg]
+	program = /usr/local/bin/gpg