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

add comment for mergetool usage, ignore mergetool artifacts

Browse Source 
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
This commit is contained in:
ahuston-0 2024-04-28 12:36:59 -04:00 committed by Alice Huston
parent 0087268b21
commit 3445436a32
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitconfig
View File

@ -1,4 +1,5 @@
# 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
[mergetool "sops-mergetool"] [mergetool "sops-mergetool"]
cmd = bash -c "$(git --exec-path)/sops-mergetool.sh \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"" cmd = bash -c "$(git --exec-path)/sops-mergetool.sh \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""
[merge] [merge]

6
.gitignore vendored
View File

@ -9,7 +9,11 @@ result
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) # 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 # allows test file in reopsitory
test.* test.*