git: add deploy and ansible-vault diff
This commit is contained in:
parent
9227102ab3
commit
80dfb1e7c9
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user