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: I6a92909a5b23a8680c16251aafa084b9a48944eamaster
parent
c797abdd29
commit
1348be9115
|
@ -20,6 +20,7 @@
|
||||||
[b4]
|
[b4]
|
||||||
attestation-check-dkim = off
|
attestation-check-dkim = off
|
||||||
attestation-policy = off
|
attestation-policy = off
|
||||||
|
shazam-am-flags = --signoff --3way
|
||||||
linkmask = https://yhetil.org/guix/%s
|
linkmask = https://yhetil.org/guix/%s
|
||||||
linktrailermask = https://yhetil.org/guix/%s
|
linktrailermask = https://yhetil.org/guix/%s
|
||||||
midmask = https://yhetil.org/guix/%s
|
midmask = https://yhetil.org/guix/%s
|
||||||
|
|
Reference in New Issue