aboutsummaryrefslogtreecommitdiff
path: root/gitconfig
blob: 1f6c49f1128de30bd53daebd07041b457e1a842c (about) (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
33
34
35
36
37
38
39
40
41
42
43
# This is Git's per-user configuration file.
[user]
	name = Timo Wilken
	email = timo.21.wilken@gmail.com
	signingkey = 53EC3C06856883DD92355BC22FC78504681F69B0
[commit]
	gpgsign = true
[url "https://"]
	insteadOf = git://
[url "ssh://git@gitlab.cern.ch:7999/"]
	insteadOf = https://gitlab.cern.ch/
[url "ssh://git@ssh.github.com/"]
	insteadOf = gh:
[gui]
	fontui = -family \"Fira Sans\" -size 10 -weight normal -slant roman -underline 0 -overstrike 0
	fontdiff = -family \"Hermit\" -size 10 -weight normal -slant roman -underline 0 -overstrike 0
	tabsize = 4
[merge]
	summary = true
	conflictstyle = diff3
[color]
	ui = auto
[pull]
	rebase = false
	ff = only
[alias]
	glog = log --decorate --graph --all --oneline
	plog = log --decorate --graph --all --oneline --pretty=tformat:\"%C(yellow)%h %Cgreen%as %Cblue%<(10,trunc)%an%Cred%d%Creset %s\"
[init]
	defaultBranch = master
[advice]
	detachedHead = false
# https://sw.kovidgoyal.net/kitty/kittens/diff/
[diff]
	tool = kitty
	guitool = kitty.gui
[difftool]
	prompt = false
	trustExitCode = true
[difftool "kitty"]
	cmd = kitty +kitten diff $LOCAL $REMOTE
[difftool "kitty.gui"]
	cmd = kitty kitty +kitten diff $LOCAL $REMOTE