guillaume
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git: add deploy and ansible-vault diff

master
Guillaume Dott 2024-09-19 09:36:13 +02:00
parent 9227102ab3
commit 80dfb1e7c9
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git/config
View File

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