diff --git a/.gitconfig b/.gitconfig index 12bcc99..094929e 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,6 +1,11 @@ # run `grep -Pv "^#" .gitconfig >> .git/config` to append the merge config to your repo file :) # run `git mergetool --tool=sops-mergetool /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 --exec-path)/sops-mergetool.sh \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"" + cmd = bash -c "$(git rev-parse --show-toplevel)/utils/sops-mergetool.sh \"\$BASE\" \"\$LOCAL\" \"\$REMOTE\" \"\$MERGED\"" [merge] - tool = nvimdiff3 + tool = nvimdiff +[mergetool "nvimdiff"] + layout = MERGED