~ruther/guix-local

1348be9115d15f8066d3d194d2c8d38ffa61fbae — Maxim Cournoyer 2 years ago c797abd
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
1 files changed, 1 insertions(+), 0 deletions(-)

M etc/git/gitconfig
M etc/git/gitconfig => etc/git/gitconfig +1 -0
@@ 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