From 3445436a322fb07a48c72685c9714d67d7b20af9 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Sun, 28 Apr 2024 12:36:59 -0400 Subject: [PATCH] add comment for mergetool usage, ignore mergetool artifacts Signed-off-by: ahuston-0 --- .gitconfig | 1 + .gitignore | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitconfig b/.gitconfig index 697cc28..12bcc99 100644 --- 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 /secrets.yaml` to use this once configured [mergetool "sops-mergetool"] cmd = bash -c "$(git --exec-path)/sops-mergetool.sh \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"" [merge] diff --git a/.gitignore b/.gitignore index f72e392..3737723 100644 --- a/.gitignore +++ b/.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.*