ahuston-0/nix-dotfiles
1
0
Fork 0
Code Issues 1 Pull Requests 2 Actions 1 Packages Projects Releases Wiki Activity

sops mergetool fixes
All checks were successful
Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 8s
Details
Check Nix flake / Perform Nix flake checks (pull_request) Successful in 3m5s
Details

Browse Source
This commit is contained in:
ahuston-0
2026-05-02 13:02:41 -04:00
parent 6a6f5a1e9d
commit 0f3e1b3e36
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitconfig
View File

@@ -1,11 +1,9 @@
# run `grep -Pv "^#" .gitconfig >> .git/config` to append the merge config to your repo file :) # 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 # 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 # the command below intentionally avoids nested shell quoting because git config parsing is strict
# find: $(git rev-parse --show-toplevel)/utils/sops-mergetool.sh
# replace: ./utils/sops-mergetool.sh
[mergetool "sops-mergetool"] [mergetool "sops-mergetool"]
cmd = bash -c "$(git rev-parse --show-toplevel)/utils/sops-mergetool.sh \"\$BASE\" \"\$LOCAL\" \"\$REMOTE\" \"\$MERGED\"" cmd = $(git rev-parse --show-toplevel)/utils/sops-mergetool.sh $BASE $LOCAL $REMOTE $MERGED
[merge] [merge]
tool = nvimdiff tool = nvimdiff
[mergetool "nvimdiff"] [mergetool "nvimdiff"]
layout = MERGED layout = (LOCAL,BASE,REMOTE)/MERGED