git: add deploy and ansible-vault diff

2024-09-19 09:36:13 +02:00 · 2024-09-19 09:36:13 +02:00 · 80dfb1e7c9
parent 9227102ab3
commit 80dfb1e7c9
1 changed files with 3 additions and 0 deletions
--- 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