add comment for mergetool usage, ignore mergetool artifacts

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
2024-04-28 12:36:59 -04:00
parent 0087268b21
commit 3445436a32
2 changed files with 6 additions and 1 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -1,4 +1,5 @@
 # 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
 [mergetool "sops-mergetool"]
        cmd = bash -c "$(git --exec-path)/sops-mergetool.sh \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""
 [merge]