summaryrefslogtreecommitdiff
path: root/git/gitconfig
blob: cedf8fb29c4b0430159dd44c1fc9ca785859d2a1 (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
44
45
46
47
48
49
50
51
52
53
54
55
56
57
[user]
	name = Reiner Herrmann

[color]
	ui = auto

[push]
	default = simple

[diff]
	renames = copy
	algorithm = histogram

[advice]
	statusHints = false
	resolveConflict = false

[sendemail]
	suppresscc = self

[init]
	templatedir = ~/.config/git/template
	defaultBranch = trunk

[alias]
	ctags = !.git/hooks/ctags

[pager]
	log = diff-highlight | less
	show = diff-highlight | less
	diff = diff-highlight | less

[interactive]
	diffFilter = diff-highlight

[tig]
	diff-highlight = true

[pull]
	ff = only

[column]
	branch = auto

[merge]
	autoStash = true
	conflictStyle = zdiff3

[rebase]
	autoStash = true
	autoSquash = true

[rerere]
	enabled = true

[url "git@salsa.debian.org:"]
	pushInsteadOf = https://salsa.debian.org/