git config changes

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
This commit is contained in:
ahuston-0 2024-04-27 20:44:00 -04:00 committed by Alice Huston
parent cec1561f51
commit 43dfbf673e

19
.gitconfig Normal file
View File

@ -0,0 +1,19 @@
[mergetool "sops-mergetool"]
cmd = ./sops-mergetool.sh "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
[merge]
tool = nvimdiff
[merge "nvimdiff"]
layout = "LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE + (LOCAL/BASE/REMOTE),MERGED"
[push]
autoSetupRemote = true
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
url = git@github.com:RAD-Development/nix-dotfiles.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "main"]
remote = origin
merge = refs/heads/main