From 80dfb1e7c933bdc13f63cbee45a2f507e27ea153 Mon Sep 17 00:00:00 2001
From: Guillaume Dott <guillaume+github@dott.fr>
Date: Thu, 19 Sep 2024 09:36:13 +0200
Subject: [PATCH] git: add deploy and ansible-vault diff

---
 git/config | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/git/config b/git/config
index f2d46b1..63c7c80 100644
--- a/git/config
+++ b/git/config
@@ -18,6 +18,7 @@
 	s = stash
 	sl = stash list
 	ss = stash show
+	deploy = !git checkout production && git merge --ff-only origin/develop
 [diff]
 	tool = vimdiff
 [merge]
@@ -39,3 +40,5 @@
 	rebase = true
 [init]
 	defaultBranch = main
+[diff "ansible-vault"]
+	textconv = ansible-vault view