summaryrefslogtreecommitdiff
path: root/.config/git/config
blob: ab82f44ae88c34e85eb0c0420f64ffe31db8907d (plain)
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
[core]
    pager = delta

[interactive]
    diffFilter = delta --color-only

[delta]
    navigate = true  # use n and N to move between diff sections
    dark = true      # or light = true, or omit for auto-detection
    side-by-side = true

[commit]
	gpgsign = false

[gpg]
	format = "ssh"

[merge]
  conflictStyle = zdiff3

[user]
	email = "ivi@vinkies.net"
	name = "Mike Vink"
	signingKey = "/Users/ivi/.ssh/id_ed25519_sk.pub"

[worktree]
	guessRemote = true

# [includeIf "hasconfig:remote.*.url:git@github.com:**/**"]
# 	path = "/nix-config/mut/git/github"
# [includeIf "hasconfig:remote.*.url:https://github.com/**/**"]
# 	path = "/nix-config/mut/git/github"