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

cleanup git config

Browse Source 
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
This commit is contained in:
ahuston-0 2024-04-27 21:00:46 -04:00 committed by Alice Huston
parent 0ddd85d247
commit 0087268b21
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.gitconfig
View File

@ -1,22 +1,5 @@
# run `grep -Pv "^#" .gitconfig >> .git/config` to append the merge config to your repo file :)
[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]
tool = nvimdiff3 tool = nvimdiff3
[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
pushRemote = origin
[branch "feature/palatine-hill-nut-2.0"]
pushRemote = origin
remote = origin
merge = refs/heads/feature/palatine-hill-nut-2.0