add comment for mergetool usage, ignore mergetool artifacts

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>

.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]

.gitignore

@@ -9,7 +9,11 @@ result
 result-*
 
 # If you run nix develop it will generate pre-commit hooks using the python library precommit (see https://github.com/RAD-Development/nix-dotfiles/blob/main/flake.nix#L65)
-.pre-commit-config.yaml
+**/.pre-commit-config.yaml
+
+# omits sops-mergetool artifacts
+**/*.yaml.orig
+**/*.yml.orig
 
 # allows test file in reopsitory
 test.*