12 lines
615 B
INI
12 lines
615 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
|
|
# if for whatever reason the below doesn't work, try modifying the mergetool command as below
|
|
# find: $(git rev-parse --show-toplevel)/utils/sops-mergetool.sh
|
|
# replace: ./utils/sops-mergetool.sh
|
|
[mergetool "sops-mergetool"]
|
|
cmd = bash -c "$(git rev-parse --show-toplevel)/utils/sops-mergetool.sh \"\$BASE\" \"\$LOCAL\" \"\$REMOTE\" \"\$MERGED\""
|
|
[merge]
|
|
tool = nvimdiff
|
|
[mergetool "nvimdiff"]
|
|
layout = MERGED
|