config/gitconfig at main · MrS-E/config · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
[gpg]
	format = ssh
[user]
	signingkey = ./git_code
	name = Simeon Stix
	email = simeon.stix@smoca.ch
[core]
	autocrlf = input
	editor = codium --wait --new-window
[diff]
	tool = codium
[difftool]
	prompt = false
[difftool "meld"]
	cmd = meld "$LOCAL" "$REMOTE"
[difftool "diffmerge"]
	cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
[difftool "codium"]
	cmd = codium "$LOCAL" "$REMOTE" "--diff" "--wait"

[merge]
	tool = codium
[mergetool]
	keepBackup = false
[mergetool "diffmerge"]
	cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
	trustExitCode = true
[mergetool "codium"]
	cmd = codium --wait $MERGE
	trustExitCode = true
[mergetool "nvim"]
    cmd = nvim -d "$LOCAL" "$BASE" "$REMOTE" "$MERGED" -c 'wincmd J | wincmd =' -c 'echo "Use :wqa to finish merge"'
    trustExitCode = false
[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
	required = true
[pull]
	rebase = false
[credential]
	helper = cache