dotfiles/dot_gitconfig.tmpl at master · KB1RMA/dotfiles · 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
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
{{ if hasPrefix "LIBP" .chezmoi.hostname  }}
[http]
	sslCAInfo = /Users/Shared/.certificates/zscaler.pem
{{ end }}

[user]
	name = Christopher Snyder
	{{ if hasPrefix "LIBP" .chezmoi.hostname }}
	email = Christopher.Snyder@libertymutual.com
	{{ else }}
	email = kb1rma@arrl.net
	{{ end }}
	signingkey = D5AFFC6BFD33D9DE

[merge]
	tool = vscode
	conflictstyle = diff3

[mergetool "p4mergetool"]
	cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $PWD/$BASE $PWD/$LOCAL $PWD/$REMOTE $PWD/$MERGED
	trustExitCode = false

[mergetool]
	keepBackup = false

[core]
	editor = nvim
	pager = delta

[interactive]
	diffFilter = delta --color-only

[delta]
	navigate = true
	side-by-side = true
	syntax-theme = TwoDark

[color]
	ui = true

[diff]
	colorMoved = default
	tool = vscode

[alias]
	last-branches = "!sh -c 'git for-each-ref --sort=\"-committerdate\" --format=\"%(committerdate)%09%(refname)\" refs/heads | sed -e \"s-refs/heads/--\"' | less"
	find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'"
	show-merge = "!sh -c 'merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge'"

[gpg]
	program = {{ lookPath "gpg" }}

[commit]
	gpgsign = true

[url "http://github.com/"]
	insteadOf = ssh://git@github.com/

[url "https://github.com/"]
	insteadOf = git://github.com/

[mergetool "vscode"]
	cmd = "code --wait "

[difftool "vscode"]
	cmd = "code --wait --diff  "