From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 18 Jun 2019 09:46:59 +0000 (+0100)
Subject: Automatically sign rebases and merge commits
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=e36990df550322036934fd4f46409a231a04c2a0;hp=b7bb5705ad376f887c54474b20273855e21a8d75;p=max%2Fsaltfiles.git

Automatically sign rebases and merge commits
---

diff --git a/states/git/init.sls b/states/git/init.sls
index 459943c..7ef7a31 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -29,6 +29,8 @@ include:
   'alias.tag': 'tag -s',
   'alias.t': 'tag -s',
   'alias.alias': '!req=$\'\\033[0;31m=\\033[0m\'; git config --get-regexp ^alias\. | sed -e s/^alias\.// -e "s/\ /\t$req\ /"',
+  'alias.rebase': 'rebase -S',
+  'alias.merge': 'merge -S',
 }
 %}