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

change merge.tool to nvimdiff3, allow sops-mergetool to be executed anywhere

Browse Source 
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
This commit is contained in:
ahuston-0 2024-04-27 20:52:09 -04:00 committed by Alice Huston
parent 43dfbf673e
commit e743e3fbb8
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.gitconfig
View File

@ -1,9 +1,7 @@
[mergetool "sops-mergetool"]
cmd = ./sops-mergetool.sh "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
cmd = bash -c "$(git --exec-path)/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"
tool = nvimdiff3
[push]
autoSetupRemote = true
[core]
@ -17,3 +15,8 @@
[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