From 1348be9115d15f8066d3d194d2c8d38ffa61fbae Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 22 Jan 2024 10:09:27 -0500
Subject: gitconfig: b4: Automatically add 'Signed-off-by' when applying
 patches.

Also use --3way to ease conflict resolutions.

* etc/git/gitconfig [b4]: Add shazam-am-flags option.

Change-Id: I6a92909a5b23a8680c16251aafa084b9a48944ea
---
 etc/git/gitconfig | 1 +
 1 file changed, 1 insertion(+)

(limited to 'etc')

diff --git a/etc/git/gitconfig b/etc/git/gitconfig
index 654a630b18..9c7827ced2 100644
--- a/etc/git/gitconfig
+++ b/etc/git/gitconfig
@@ -20,6 +20,7 @@
 [b4]
         attestation-check-dkim = off
         attestation-policy = off
+        shazam-am-flags = --signoff --3way
         linkmask = https://yhetil.org/guix/%s
         linktrailermask = https://yhetil.org/guix/%s
         midmask = https://yhetil.org/guix/%s
-- 
cgit v1.2.3