10 lines
504 B
INI
10 lines
504 B
INI
# run `grep -Pv "^#" .gitconfig >> .git/config` to append the merge config to your repo file :)
|
|
# run `git mergetool --tool=sops-mergetool <path to secret>/secrets.yaml` to use this once configured
|
|
# the command below intentionally avoids nested shell quoting because git config parsing is strict
|
|
[mergetool "sops-mergetool"]
|
|
cmd = $(git rev-parse --show-toplevel)/utils/sops-mergetool.sh $BASE $LOCAL $REMOTE $MERGED
|
|
[merge]
|
|
tool = nvimdiff
|
|
[mergetool "nvimdiff"]
|
|
layout = (LOCAL,BASE,REMOTE)/MERGED
|