1348be9115
Also use --3way to ease conflict resolutions. * etc/git/gitconfig [b4]: Add shazam-am-flags option. Change-Id: I6a92909a5b23a8680c16251aafa084b9a48944ea
26 lines
653 B
Text
26 lines
653 B
Text
[diff "scheme"]
|
|
xfuncname = "^(\\(define.*)$"
|
|
|
|
[diff "texinfo"]
|
|
xfuncname = "^@node[[:space:]]+([^,]+).*$"
|
|
|
|
[format]
|
|
forceinbodyfrom = true # help preserve commit authorship
|
|
thread = shallow
|
|
useAutoBase = true
|
|
|
|
[pull]
|
|
rebase = true
|
|
|
|
[sendemail]
|
|
to = guix-patches@gnu.org
|
|
headerCmd = etc/teams.scm cc-members-header-cmd
|
|
thread = no
|
|
|
|
[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
|