diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-01-22 10:09:27 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-01-24 10:42:41 -0500 |
| commit | 1348be9115d15f8066d3d194d2c8d38ffa61fbae (patch) | |
| tree | f65b26a82ecd1e8c8d27291282a010749d470ef2 | |
| parent | c797abdd299e32bd599d2fb45493334cf4d4cd73 (diff) | |
| download | guix-1348be9115d15f8066d3d194d2c8d38ffa61fbae.tar.gz | |
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
| -rw-r--r-- | etc/git/gitconfig | 1 |
1 files changed, 1 insertions, 0 deletions
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 |